Added Events management, removed dependency with ModuleXtender