Update Comparable and Comparator Interface