Moving comparator logic to PropertyLoader