Update to test new MessageBus