add support for null values