Changed instance for event_dispatcher parameter