Modify mq-related code#10