Adding support for IS NULL and IS NOT NULL conditions