Modify mq-related code#7