Added the EventDispatcher