Add support for null values