Modified some things in PluginFinder