Adding support for nulls