Updated EventManager
Updated EventManager, PluginManager