Migrating EventMgr to new structure