Backward compatible mapping