Updated the map_raw_data_type method.