Adding more support for nullable values