diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index e3bf493a72802a49e4e0f32324454406a4b1c8ac..2928f36a2364dcc7e3d2efb3d0d4ffd8bd18c455 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -7236,6 +7236,7 @@ module OneM2M_Templates {
 			creator := omit,//O
 			regularResourcesAsTarget := omit,//O
 			subscriptionResourcesAsTarget := omit,//O
+			regularResourcesAsTargetSubscriptions := omit, //NP
 			timeWindowType := p_timeWindowType,//M
 			timeWindowSize := p_timeWindowSize,//M
 			eventNotificationCriteriaSet := omit,//O
@@ -10458,6 +10459,7 @@ module OneM2M_Templates {
 			creator := ?,//M
 			regularResourcesAsTarget := *,//O
 			subscriptionResourcesAsTarget := *,//O
+			regularResourcesAsTargetSubscriptions := *,//O
 			timeWindowType := ?,//M
 			timeWindowSize := ?,//M
 			eventNotificationCriteriaSet := *,//O
@@ -10485,6 +10487,7 @@ module OneM2M_Templates {
 			creator := omit,//M
 			regularResourcesAsTarget := omit,//O
 			subscriptionResourcesAsTarget := omit,//O
+			regularResourcesAsTargetSubscriptions := omit,//O
 			timeWindowType := omit,//M
 			timeWindowSize := omit,//M
 			eventNotificationCriteriaSet := omit,//O
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index 1a9c397148df6b9fdb9606364828c5e8587a3aa8..c169c196e96a2f27d8b23df5ea86f50f27fe51e5 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -4416,6 +4416,7 @@ group OptionalResourceTypes {
 		XSD.ID creator optional,
 		ListOfURIs regularResourcesAsTarget optional,
 		ListOfURIs subscriptionResourcesAsTarget optional,
+		ListOfURIs regularResourcesAsTargetSubscriptions optional,
 		TimeWindowType timeWindowType optional,
 		XSD.Duration timeWindowSize optional,
 		EventNotificationCriteriaSet eventNotificationCriteriaSet optional,
@@ -5532,6 +5533,17 @@ group Values {
 					
 	
 }//end of Values group
+
+group PatternValues {
+
+	const universal charstring c_point := "(\[[-+]#(0,1)(180(.0#(1,))#(0,1)|((1[0-7]\d)|([1-9]#(0,1)\d))(.\d#(1,))#(0,1))[,][\q{0,0,0,32}\t]#(0,)[-+]#(0,1)([1-8]#(0,1)\d(.\d#(1,))#(0,1)|90(.0#(1,))#(0,1))([,]\d#(1,))#(0,1)\])";
+	template universal charstring c_multipoint := pattern "^\[{c_point}([,][\q{0,0,0,32}\t]#(0,){c_point})#(0,)\]$";
+	template universal charstring c_lineStringOrMultipoint:= pattern "\[{c_point}([,][\q{0,0,0,32}\t]#(0,){c_point})#(1,)\]";
+	template universal charstring c_multiLineString :=  pattern "^\[{c_lineStringOrMultipoint}([,][\q{0,0,0,32}\t]#(0,){c_lineStringOrMultipoint})#(0,)\]$";
+	template universal charstring c_polygon := pattern "\[#2{c_point}([,][\q{0,0,0,32}\t]#(0,){c_point})#(3,)\]#2";//Original pattern cannot be done in TTCN, first and last element must be equal and this cannot be matched by using the pattern "\[#2(?P<FirstPoint>{c_point})(,[\q{0,0,0,32}\t]#(0,){c_point})#(2,)(,[\q{0,0,0,32}\t]#(0,)(?P=FirstPoint)\]#2)";
+	template universal charstring c_multipolygon := pattern "^\[{c_polygon}(,[\q{0,0,0,32}\t]#(0,){c_polygon})#(0,)\]$";
+
+}//end of PatternValues group
 	
 } 
 // end of module
diff --git a/LibOneM2M/oneM2M_Types b/LibOneM2M/oneM2M_Types
index c29cc72cb1ba0a9c3c236cad5170e5dda9596bd1..c28b5a251515b8745a7fd0bf37ea917b1d719357 160000
--- a/LibOneM2M/oneM2M_Types
+++ b/LibOneM2M/oneM2M_Types
@@ -1 +1 @@
-Subproject commit c29cc72cb1ba0a9c3c236cad5170e5dda9596bd1
+Subproject commit c28b5a251515b8745a7fd0bf37ea917b1d719357