Now that MessageBroker is becoming more generic it really shouldn't be tied to events. All the event logic should be moved into a separate EventDispatcher class.