Modify mq-related codes#4