Make non-required primitives nullable