added mq support