Make all events dispatch to PluginLoader and update constants
Fix Disconnect