Updated EventManager, PluginManager