updated data_mapping