Adds support for nullable properties