Add separate control fields for NULL and for default values