Adding Comparator and selector