Added support for nullable values