enhance MessageBroker
enhance MessageBroker