Adding support for null types