Added NullAllowed attributes