diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index 1b3b51db9fa4c3ede147b99228dd4d8da118dff2..11cab9f23812b98b87e7cb0731dbe8e033e6b604 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -977,8 +977,8 @@ group OptionalResourceTypes {
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record of union {
-				GenericInterworkingService genericInterworkingService,
-				GenericInterworkingOperationInstance genericInterworkingOperationInstance,
+				GenericInterworkingService_optional genericInterworkingService,
+				GenericInterworkingOperationInstance_optional genericInterworkingOperationInstance,
 				SemanticDescriptor semanticDescriptor,
 				Subscription subscription
 			} choice_list
@@ -3902,8 +3902,8 @@ group InvalidTypes {
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record of union {
-				GenericInterworkingService genericInterworkingService,
-				GenericInterworkingOperationInstance genericInterworkingOperationInstance,
+				GenericInterworkingService_optional genericInterworkingService,
+				GenericInterworkingOperationInstance_optional genericInterworkingOperationInstance,
 				SemanticDescriptor semanticDescriptor,
 				Subscription subscription
 			} choice_list
diff --git a/LibOneM2M/oneM2M_Types b/LibOneM2M/oneM2M_Types
index fa3612294c98eb8abf03b1440753844e73d8fff5..4a7fc4839d66ad69c3cb554c38ef28d275183b21 160000
--- a/LibOneM2M/oneM2M_Types
+++ b/LibOneM2M/oneM2M_Types
@@ -1 +1 @@
-Subproject commit fa3612294c98eb8abf03b1440753844e73d8fff5
+Subproject commit 4a7fc4839d66ad69c3cb554c38ef28d275183b21