Added comparator classes