Updated EventManager