Added null and not null comparators