EventDispatcher improvements