Adding support for nullable