Modify mq-related code#9