Updated comparators to new API