Adding support for null values