Support for nullable added