Modify mq-related codes#3