Added support for nullable primitive types