diff --git a/src/resources/4_0_0/inputs/questionnaireitemansweroption.input.js b/src/resources/4_0_0/inputs/questionnaireitemansweroption.input.js
index 0c1ed0f5..2ec52480 100644
--- a/src/resources/4_0_0/inputs/questionnaireitemansweroption.input.js
+++ b/src/resources/4_0_0/inputs/questionnaireitemansweroption.input.js
@@ -43,7 +43,7 @@ module.exports = new GraphQLInputObjectType({
 				"A potential answer that's allowed as the answer to this question.",
 		},
 		valueInteger: {
-			type: new GraphQLNonNull(GraphQLInt),
+			type: GraphQLInt,
 			description:
 				"A potential answer that's allowed as the answer to this question.",
 		},
@@ -53,7 +53,7 @@ module.exports = new GraphQLInputObjectType({
 				"A potential answer that's allowed as the answer to this question.",
 		},
 		valueDate: {
-			type: new GraphQLNonNull(DateScalar),
+			type: DateScalar,
 			description:
 				"A potential answer that's allowed as the answer to this question.",
 		},
@@ -63,7 +63,7 @@ module.exports = new GraphQLInputObjectType({
 				"A potential answer that's allowed as the answer to this question.",
 		},
 		valueTime: {
-			type: new GraphQLNonNull(TimeScalar),
+			type: TimeScalar,
 			description:
 				"A potential answer that's allowed as the answer to this question.",
 		},
@@ -73,17 +73,17 @@ module.exports = new GraphQLInputObjectType({
 				"A potential answer that's allowed as the answer to this question.",
 		},
 		valueString: {
-			type: new GraphQLNonNull(GraphQLString),
+			type: GraphQLString,
 			description:
 				"A potential answer that's allowed as the answer to this question.",
 		},
 		valueCoding: {
-			type: new GraphQLNonNull(require('./coding.input.js')),
+			type: require('./coding.input.js'),
 			description:
 				"A potential answer that's allowed as the answer to this question.",
 		},
 		valueReference: {
-			type: new GraphQLNonNull(GraphQLString),
+			type: GraphQLString,
 			description:
 				"A potential answer that's allowed as the answer to this question.",
 		},
diff --git a/src/resources/4_0_0/inputs/questionnaireitemenablewhen.input.js b/src/resources/4_0_0/inputs/questionnaireitemenablewhen.input.js
index 92372f11..fa4a3be9 100644
--- a/src/resources/4_0_0/inputs/questionnaireitemenablewhen.input.js
+++ b/src/resources/4_0_0/inputs/questionnaireitemenablewhen.input.js
@@ -74,7 +74,7 @@ module.exports = new GraphQLInputObjectType({
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerDecimal: {
-			type: new GraphQLNonNull(GraphQLFloat),
+			type: GraphQLFloat,
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
@@ -84,7 +84,7 @@ module.exports = new GraphQLInputObjectType({
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerInteger: {
-			type: new GraphQLNonNull(GraphQLInt),
+			type: GraphQLInt,
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
@@ -94,7 +94,7 @@ module.exports = new GraphQLInputObjectType({
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerDate: {
-			type: new GraphQLNonNull(DateScalar),
+			type: DateScalar,
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
@@ -104,7 +104,7 @@ module.exports = new GraphQLInputObjectType({
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerDateTime: {
-			type: new GraphQLNonNull(DateTimeScalar),
+			type: DateTimeScalar,
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
@@ -114,7 +114,7 @@ module.exports = new GraphQLInputObjectType({
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerTime: {
-			type: new GraphQLNonNull(TimeScalar),
+			type: TimeScalar,
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
@@ -124,22 +124,22 @@ module.exports = new GraphQLInputObjectType({
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerString: {
-			type: new GraphQLNonNull(GraphQLString),
+			type: GraphQLString,
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerCoding: {
-			type: new GraphQLNonNull(require('./coding.input.js')),
+			type: require('./coding.input.js'),
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerQuantity: {
-			type: new GraphQLNonNull(require('./quantity.input.js')),
+			type: require('./quantity.input.js'),
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerReference: {
-			type: new GraphQLNonNull(GraphQLString),
+			type: GraphQLString,
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
diff --git a/src/resources/4_0_0/schemas/questionnaireitemansweroption.schema.js b/src/resources/4_0_0/schemas/questionnaireitemansweroption.schema.js
index 08fc1426..35fe0f79 100644
--- a/src/resources/4_0_0/schemas/questionnaireitemansweroption.schema.js
+++ b/src/resources/4_0_0/schemas/questionnaireitemansweroption.schema.js
@@ -44,7 +44,7 @@ module.exports = new GraphQLObjectType({
 				"A potential answer that's allowed as the answer to this question.",
 		},
 		valueInteger: {
-			type: new GraphQLNonNull(GraphQLInt),
+			type: GraphQLInt,
 			description:
 				"A potential answer that's allowed as the answer to this question.",
 		},
@@ -54,7 +54,7 @@ module.exports = new GraphQLObjectType({
 				"A potential answer that's allowed as the answer to this question.",
 		},
 		valueDate: {
-			type: new GraphQLNonNull(DateScalar),
+			type: DateScalar,
 			description:
 				"A potential answer that's allowed as the answer to this question.",
 		},
@@ -64,7 +64,7 @@ module.exports = new GraphQLObjectType({
 				"A potential answer that's allowed as the answer to this question.",
 		},
 		valueTime: {
-			type: new GraphQLNonNull(TimeScalar),
+			type: TimeScalar,
 			description:
 				"A potential answer that's allowed as the answer to this question.",
 		},
@@ -74,18 +74,17 @@ module.exports = new GraphQLObjectType({
 				"A potential answer that's allowed as the answer to this question.",
 		},
 		valueString: {
-			type: new GraphQLNonNull(GraphQLString),
+			type: GraphQLString,
 			description:
 				"A potential answer that's allowed as the answer to this question.",
 		},
 		valueCoding: {
-			type: new GraphQLNonNull(require('./coding.schema.js')),
+			type: require('./coding.schema.js'),
 			description:
 				"A potential answer that's allowed as the answer to this question.",
 		},
 		valueReference: {
-			type: new GraphQLNonNull(
-				new GraphQLUnionType({
+			type: new GraphQLUnionType({
 					name:
 						'QuestionnaireitemanswerOptionvalueReference_valueReference_Union',
 					description:
@@ -97,7 +96,6 @@ module.exports = new GraphQLObjectType({
 						}
 					},
 				}),
-			),
 			description:
 				"A potential answer that's allowed as the answer to this question.",
 		},
diff --git a/src/resources/4_0_0/schemas/questionnaireitemenablewhen.schema.js b/src/resources/4_0_0/schemas/questionnaireitemenablewhen.schema.js
index 8c194cac..f838dddd 100644
--- a/src/resources/4_0_0/schemas/questionnaireitemenablewhen.schema.js
+++ b/src/resources/4_0_0/schemas/questionnaireitemenablewhen.schema.js
@@ -75,7 +75,7 @@ module.exports = new GraphQLObjectType({
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerDecimal: {
-			type: new GraphQLNonNull(GraphQLFloat),
+			type: GraphQLFloat,
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
@@ -85,7 +85,7 @@ module.exports = new GraphQLObjectType({
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerInteger: {
-			type: new GraphQLNonNull(GraphQLInt),
+			type: GraphQLInt,
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
@@ -95,7 +95,7 @@ module.exports = new GraphQLObjectType({
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerDate: {
-			type: new GraphQLNonNull(DateScalar),
+			type: DateScalar,
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
@@ -105,7 +105,7 @@ module.exports = new GraphQLObjectType({
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerDateTime: {
-			type: new GraphQLNonNull(DateTimeScalar),
+			type: DateTimeScalar,
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
@@ -115,7 +115,7 @@ module.exports = new GraphQLObjectType({
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerTime: {
-			type: new GraphQLNonNull(TimeScalar),
+			type: TimeScalar,
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
@@ -125,23 +125,22 @@ module.exports = new GraphQLObjectType({
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerString: {
-			type: new GraphQLNonNull(GraphQLString),
+			type: GraphQLString,
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerCoding: {
-			type: new GraphQLNonNull(require('./coding.schema.js')),
+			type: require('./coding.schema.js'),
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerQuantity: {
-			type: new GraphQLNonNull(require('./quantity.schema.js')),
+			type: require('./quantity.schema.js'),
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},
 		answerReference: {
-			type: new GraphQLNonNull(
-				new GraphQLUnionType({
+			type: new GraphQLUnionType({
 					name:
 						'QuestionnaireitemenableWhenanswerReference_answerReference_Union',
 					description:
@@ -153,7 +152,6 @@ module.exports = new GraphQLObjectType({
 						}
 					},
 				}),
-			),
 			description:
 				'A value that the referenced question is tested using the specified operator in order for the item to be enabled.',
 		},