Added checks and support for all comparators.