Added EventDispatcher adapter