Reorganized MQMapper