Added EventManager and all event service calls