Added support for more (enough?) comparisons