Refactor to include partial 'fields'