Rewrite and unified the Comparator creation