Added not greater/less-than tokens