Modify mq-related codes#2