Added the EventManager functionality