Refactoring to MessageBroadcaster