Change responsibility of picking the comparator