Added new EventDispatcher implementation