simplified all of the record/record_set mappings