Simplify EventManager class