Added support for comparators