Supported for latest mq