PluginManager improved