diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index 77973404db6199e60174ada333173f7d62c0e434..9bc472f6a4f021301a66232154475f49122ca07a 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -5695,7 +5695,7 @@ type record MgmtCmd
 			Subscription subscription,
 			Transaction transaction
 		} choice_list
-	} choice
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -6007,7 +6007,7 @@ type record Notification_1
 	} notificationEvent optional,
 	XSD.Boolean verificationRequest optional,
 	XSD.Boolean subscriptionDeletion optional,
-	XSD.AnyURI subscriptionReference optional,
+	XSD.AnyURI subscriptionReference,
 	XSD.ID creator optional,
 	XSD.AnyURI notificationForwardingURI optional,
 	XSD.ID notificationTarget optional,
@@ -7819,8 +7819,9 @@ with {
   variant (choice.choice_list[-]) "untagged";
 };
 
+type TimeSeriesNotificationType TimeSeriesNotification;
 
-type record TimeSeriesNotification
+type record TimeSeriesNotificationType
 {
 	MissingDataList missingDataList,
 	XSD.NonNegativeInteger missingDataCurrentNr