Better support for nullable types