Modify mq-related code#8