Changed IMessageBus behaviour