Added persistence of comparator fields