EventManager reworked