diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index cf399bcf2b400c31fc953ae0c720850aaca54a13..99506a0d6c87a759362c0edede7313664c336f1d 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -15,7 +15,7 @@ module OneM2M_Types {
 
 
 import from XSD all;
-import from OneM2M_TypesAndValues {type Resource_2; type ResourceTypeList_1; type PrimitiveContent; type RecordOfDynAuthJWT};//TODO Manually added until XSD files are updated
+import from OneM2M_TypesAndValues {type Resource_2; type ResourceTypeList_1; type PrimitiveContent; type RecordOfDynAuthJWT; template c_multipolygon;template c_polygon;template c_multiLineString;template c_lineStringOrMultipoint;template c_multipoint;const c_point;};//TODO Manually added until XSD files are updated
 import from OneM2M_Types_homeDevice {type Battery; type BatteryAnnc};
 
 
@@ -2180,7 +2180,7 @@ with {
 };
 
 
-type XSD.String ListOfCoordinates (pattern "(\[(\[[-+]#(0,1)([1-8]#(0,1)\d(.\d#(1,))#(0,1)|90(.0#(1,))#(0,1)),[\q{0,0,0,32}\t]#(0,)[-+]#(0,1)(180(.0#(1,))#(0,1)|((1[0-7]\d)|([1-9]#(0,1)\d))(.\d#(1,))#(0,1))(,\d#(1,))#(0,1)\])(,(\[[-+]#(0,1)([1-8]#(0,1)\d(.\d#(1,))#(0,1)|90(.0#(1,))#(0,1)),[\q{0,0,0,32}\t]#(0,)[-+]#(0,1)(180(.0#(1,))#(0,1)|((1[0-7]\d)|([1-9]#(0,1)\d))(.\d#(1,))#(0,1))(,\d#(1,))#(0,1)\]))#(1,)(\]))|(\[[-+]#(0,1)([1-8]#(0,1)\d(.\d#(1,))#(0,1)|90(.0#(1,))#(0,1)),[\q{0,0,0,32}\t]#(0,)[-+]#(0,1)(180(.0#(1,))#(0,1)|((1[0-7]\d)|([1-9]#(0,1)\d))(.\d#(1,))#(0,1))(,\d#(1,))#(0,1)\])")
+type XSD.String ListOfCoordinates (pattern "{c_multipolygon}|{c_polygon}|{c_multiLineString}|{c_lineStringOrMultipoint}|{c_multipoint}|{c_point}")
 with {
   variant "name as uncapitalized";
 };
@@ -4058,6 +4058,7 @@ type record CrossResourceSubscription
 	XSD.ID creator,
 	ListOfURIs regularResourcesAsTarget optional,
 	ListOfURIs subscriptionResourcesAsTarget optional,
+	ListOfURIs regularResourcesAsTargetSubscriptions optional,
 	TimeWindowType timeWindowType,
 	XSD.Duration timeWindowSize,
 	EventNotificationCriteriaSet eventNotificationCriteriaSet optional,