Added M55 compatible mapping