Add PluginManager and remove PackageManager