Added MAPPING_TYPES back for backwards compatability