diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index a979d2b138a67850fda343283b2e230b51907cb3..b3851c716692a71725ebcd08f4363879c245183a 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -2445,7 +2445,7 @@ module OneM2M_Templates {
 			subscriberURI := p_subscriberURI//O
 		}; 
 		
-		template (value) EventNotificationCriteria m_eventNotificationCriteria ( in EventNotificationCriteria.notificationEventType_list p_notificationEventType_list := {}, template (omit) EventNotificationCriteria.attribute p_attribute_list := omit) := { //the parameter should be a list of NotificationEventTypeEventType
+		template (value) EventNotificationCriteria m_eventNotificationCriteria (template (omit) EventNotificationCriteria.notificationEventType_list p_notificationEventType_list := omit, template (omit) EventNotificationCriteria.attribute p_attribute_list := omit) := { //the parameter should be a list of NotificationEventTypeEventType
 			createdBefore := omit,
 			createdAfter := omit,
 			modifiedSince := omit,
@@ -2456,7 +2456,7 @@ module OneM2M_Templates {
 			expireAfter := omit,
 			sizeAbove := omit,
 			sizeBelow := omit,
-			operationMonitor_list := {},
+			operationMonitor_list := omit,
 			attribute := p_attribute_list, 
 			notificationEventType_list := p_notificationEventType_list,// TODO this list should be able to be omited see 9.6.8 (TS0001)
 			missingData := omit,
diff --git a/LibOneM2M/oneM2M_Types b/LibOneM2M/oneM2M_Types
index 626736e00ca0d15d8bc366f5611ea14f9f5db13a..ef0d9c441fd1e756b00142f4862f8439352fa7c6 160000
--- a/LibOneM2M/oneM2M_Types
+++ b/LibOneM2M/oneM2M_Types
@@ -1 +1 @@
-Subproject commit 626736e00ca0d15d8bc366f5611ea14f9f5db13a
+Subproject commit ef0d9c441fd1e756b00142f4862f8439352fa7c6