Modified for latest mq
Modify mq-related configurations