Improve the pluginmanager