Added support for comparisons