MQ2 Parser Changes