Comparators extracted to separated module