diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd
index 52475fd4739be71afffbad663481cec01544c342..95a40553339350a771517402885310578a701dff 100644
--- a/CDT-commonTypes.xsd
+++ b/CDT-commonTypes.xsd
@@ -491,9 +491,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		</xs:restriction> 
 	</xs:simpleType>
 	
-	<xs:simpleType name="listOfCoordinates">
+	<xs:simpleType name="geoJsonCoordinates">
 		<xs:restriction base="xs:string">
-			<xs:pattern value="(\[(\[[-+]?([1-8]?\d(\.\d+)?|90(\.0+)?),\s*[-+]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?)(,\d+)?\])(,(\[[-+]?([1-8]?\d(\.\d+)?|90(\.0+)?),\s*[-+]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?)(,\d+)?\])){1,}(\]))|(\[[-+]?([1-8]?\d(\.\d+)?|90(\.0+)?),\s*[-+]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?)(,\d+)?\])"/>
+			<xs:pattern value="(?'MultiPolygon'^\[(?&Polygon)(,\s*(?&Polygon)){0,}\]$)|(?'Polygon'\[{2}(?P<FirstPoint>(?&Point))(,\s*(?&Point)){2,}(,\s*(?P=FirstPoint)\]{2}))|(?'MultiLineString'^\[(?&LineStringOrMultipoint)(,\s*(?&LineStringOrMultipoint)){0,}\]$)|(?'LineStringOrMultipoint'\[(?&Point)(,\s*(?&Point)){1,}\])|(?'Multipoint'^\[(?&Point)(,\s*(?&Point)){0,}\]$)|(?'Point'\[[-+]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?),\s*[-+]?([1-8]?\d(\.\d+)?|90(\.0+)?)(,\d+)?\])" />
 		</xs:restriction>
 	</xs:simpleType>
 	
@@ -1423,14 +1423,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	<xs:complexType name="geoCoordinates">
 		<xs:sequence>
 			<xs:element name="type" type="m2m:geometryType" minOccurs="1" />
-			<xs:element name="coordinates" type="m2m:listOfCoordinates" minOccurs="1" />
+			<xs:element name="coordinates" type="m2m:geoJsonCoordinates" minOccurs="1" />
 		</xs:sequence>
 	</xs:complexType>	
 
 	<xs:complexType name="geoQuery">
 		<xs:sequence>
 			<xs:element name="geometryType" type="m2m:geometryType" minOccurs="1" />
-			<xs:element name="geometry" type="m2m:listOfCoordinates" minOccurs="1" />
+			<xs:element name="geometry" type="m2m:geoJsonCoordinates" minOccurs="1" />
 			<xs:element name="geoSpatialFunction" type="m2m:geoSpatialFunctionType" minOccurs="1" />
 		</xs:sequence>
 	</xs:complexType>