Moved EventDispatcher implementation into source file