Refactored field_list to simplify logic