MDL-52702 plagiarism: Improvements to base plugin class