Modify mq-related code#6