Changes for Cherry Picker, Comparator etc