Updated MessageBus and Subscription