Add NOT and <>
Add <, >, <= and >=