Modified PluginFinder