Added support for less than / greater than operators