Changes for new MQ version