Change field definitions to list and allow multiple comparators per field