Add field_map to data_fields