Added support for nullable types