Improved EventManager