replaced the map for custom field values with a ValueTuple list