Refactor messaging to wrap eventbus messages and provide more information.