Change typehints for EventDispatcher