diff --git a/v2_1_0/DCFG-MAFClientRegCfg-v2_1_0.xsd b/v2_1_0/DCFG-MAFClientRegCfg-v2_1_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..503f400311732a271d12f45fdcab29870a08843d
--- /dev/null
+++ b/v2_1_0/DCFG-MAFClientRegCfg-v2_1_0.xsd
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2017, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
+No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/deviceConfig" 
+	xmlns:m2m="http://www.onem2m.org/xml/protocols"  
+	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	
+	elementFormDefault="unqualified" attributeFormDefault="unqualified">
+	
+	<xs:include schemaLocation="DCFG-commonTypes-v2_1_0.xsd" />
+	
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+
+	
+	<xs:element name="MAFClientRegCfg" substitutionGroup="m2m:sg_mgmtResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from data type "mgmtResource" -->
+				<xs:extension base="m2m:mgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="fqdn" type="xs:anyURI" />
+						<xs:element name="adminFQDN" type="xs:anyURI" />
+						<xs:element name="httpPort" type="xs:unsignedByte" minOccurs="0"/>
+						<xs:element name="coapPort" type="xs:unsignedByte" minOccurs="0"/>
+						<xs:element name="websocketPort" type="xs:unsignedByte" minOccurs="0"/>
+						
+						<!-- Instantiations of this [MAFClientRegCfg] resource type shall include one mgmntLink to
+	                         the following child resource:
+	                         1 mgmtLink to an instance of resource type [authenticationProfile]   -->
+						<xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="1" />					
+						
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef"
+								maxOccurs="unbounded"/>
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded"/>
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	
+</xs:schema>
diff --git a/v2_1_0/DCFG-MEFClientRegCfg-v2_1_0.xsd b/v2_1_0/DCFG-MEFClientRegCfg-v2_1_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..472dbd039293e34e9fc7b76d9f1e0788fe96176e
--- /dev/null
+++ b/v2_1_0/DCFG-MEFClientRegCfg-v2_1_0.xsd
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2017, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
+No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/deviceConfig" 
+	xmlns:m2m="http://www.onem2m.org/xml/protocols"  
+	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	
+	elementFormDefault="unqualified" attributeFormDefault="unqualified">
+	
+	<xs:include schemaLocation="DCFG-commonTypes-v2_1_0.xsd" />
+	
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+
+	
+	<xs:element name="MEFClientRegCfg" substitutionGroup="m2m:sg_mgmtResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from data type "mgmtResource" -->
+				<xs:extension base="m2m:mgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="fqdn" type="xs:anyURI" />
+						<xs:element name="adminFQDN" type="xs:anyURI" />
+						<xs:element name="httpPort" type="xs:unsignedByte" minOccurs="0"/>
+						<xs:element name="coapPort" type="xs:unsignedByte" minOccurs="0"/>
+						<xs:element name="websocketPort" type="xs:unsignedByte" minOccurs="0"/>
+									
+						<!-- Instantiations of this [MEFClientRegCfg] resource type shall include one mgmntLink to
+	                         the following child resource:
+	                         1 mgmtLink to an instance of resource type [authenticationProfile]   -->
+						<xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="1" />					
+						
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef"
+								maxOccurs="unbounded"/>
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded"/>
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	
+</xs:schema>
diff --git a/v2_1_0/DCFG-authenticationProfile-v2_1_0.xsd b/v2_1_0/DCFG-authenticationProfile-v2_1_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..8a4182e8870ec2b76fa7929fc3821b13573a2975
--- /dev/null
+++ b/v2_1_0/DCFG-authenticationProfile-v2_1_0.xsd
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2017, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
+No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/deviceConfig" 
+	xmlns:m2m="http://www.onem2m.org/xml/protocols" 
+	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" 
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:sec="http://www.onem2m.org/xml/securityProtocols"
+	elementFormDefault="unqualified" attributeFormDefault="unqualified">
+	
+	<xs:include schemaLocation="DCFG-commonTypes-v2_1_0.xsd" />
+	
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_9_0.xsd" />
+	
+	<xs:element name="authenticationProfile" substitutionGroup="m2m:sg_mgmtResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from data type "mgmtResource" -->
+				<xs:extension base="m2m:mgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="SUID" type="m2m:suid"/>
+						<xs:element name="TLSCiphersuites" type="dcfg:listOfTLSCiphersuite"
+							minOccurs="0"/>
+						<xs:element name="symmKeyID" type="sec:credentialID" minOccurs="0"/>
+						<xs:element name="symmKeyValue" type="xs:base64Binary" minOccurs="0"/>
+						<xs:element name="MAFKeyRegLabels" type="m2m:labels" minOccurs="0"/>
+						<xs:element name="MAFKeyRegDuration" type="xs:duration" minOccurs="0"/>
+						<xs:element name="mycertFingerprint" minOccurs="0">
+							<xs:simpleType>
+								<xs:union>
+									<simpleType>
+										<restriction base="dcfg:niURI"/>
+									</simpleType>
+									<simpleType>
+										<restriction base="dcfg:nihURI"/>
+									</simpleType>
+								</xs:union>
+							</xs:simpleType>
+						</xs:element>
+						<xs:element name="rawPubKeyID" minOccurs="0">
+							<xs:simpleType>
+								<xs:union>
+									<simpleType>
+										<restriction base="dcfg:niURI"/>
+									</simpleType>
+									<simpleType>
+										<restriction base="dcfg:nihURI"/>
+									</simpleType>
+								</xs:union>
+							</xs:simpleType>
+						</xs:element>
+
+						<!-- Instantiations of this [authenticationProfile] resource type shall include mgmntLink's to
+	                         the following children:
+	                         0 .. L mgmtLink to an instance of resource type [trustAnchorCred]  
+						     or 1 mgmtLink to an instance of resource type [MAFClientRegCfg] 
+						     depending on SUID value setting, see TS-0022 -->
+						<xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="0"
+							maxOccurs="unbounded"/>
+
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef"
+								maxOccurs="unbounded"/>
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded"/>
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	
+	<!-- "listOfTLSCiphersuite" is a space separated list of 4-character hexadecimal strings -->
+	<xs:simpleType name="listOfTLSCiphersuite">
+		<xs:restriction> 
+			<xs:simpleType> 
+				<xs:list itemType="dcfg:TLSCiphersuites" /> 
+			</xs:simpleType> 				
+			<xs:minLength value="1" /> 
+		</xs:restriction> 
+	</xs:simpleType>
+	
+</xs:schema>
diff --git a/v2_1_0/DCFG-commonTypes-v2_1_0.xsd b/v2_1_0/DCFG-commonTypes-v2_1_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..3534cd3f3ff41307c8b8ee5ff376311080985f0f
--- /dev/null
+++ b/v2_1_0/DCFG-commonTypes-v2_1_0.xsd
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
+No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://www.onem2m.org/xml/deviceConfig"
+	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="unqualified">
+
+	<!-- <xs:include schemaLocation="CDT-enumerationTypes-v2_12_0.xsd" />  -->
+
+	<!--********************** -->
+	<!-- Simple Types   -->
+	<!--********************** -->
+
+
+	<xs:simpleType name="niURI">
+		<xs:restriction base="xs:anyURI"/>
+	</xs:simpleType>
+
+	<xs:simpleType name="nihURI">
+		<xs:restriction base="xs:anyURI"/>
+	</xs:simpleType>
+
+
+	<!--********************** -->
+	<!--  Enumerated Types -->
+	<!--********************** -->
+
+	<xs:simpleType name="TLSCiphersuites">
+		<xs:annotation>
+			<xs:documentation>Used for TLSCiphersuites attribute of [authenticationProfile]
+				specialization of &lt;mgmtObj&gt; resource type.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<!-- TLS_DHE_DSS_WITH_AES_128_CBC_SHA256 -->
+			<xs:enumeration value="0040"/>
+			<!-- TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 -->
+			<xs:enumeration value="0067"/>
+			<!-- TLS_DH_DSS_WITH_AES_256_CBC_SHA256 -->
+			<xs:enumeration value="0068"/>
+			<!-- TLS_DH_RSA_WITH_AES_256_CBC_SHA256 -->
+			<xs:enumeration value="0069"/>
+			<!-- TLS_DHE_DSS_WITH_AES_256_CBC_SHA256 -->
+			<xs:enumeration value="006A"/>
+			<!-- TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 -->
+			<xs:enumeration value="006B"/>
+			<!-- TLS_RSA_WITH_AES_128_GCM_SHA256 -->
+			<xs:enumeration value="009C"/>
+			<!-- TLS_RSA_WITH_AES_256_GCM_SHA384 -->
+			<xs:enumeration value="009D"/>
+			<!-- TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 -->
+			<xs:enumeration value="009E "/>
+			<!-- TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 -->
+			<xs:enumeration value="009F"/>
+			<!-- TLS_DH_RSA_WITH_AES_128_GCM_SHA256 -->
+			<xs:enumeration value="00A0"/>
+			<!-- TLS_DH_RSA_WITH_AES_256_GCM_SHA384 -->
+			<xs:enumeration value="00A1"/>
+			<!-- TLS_DHE_DSS_WITH_AES_128_GCM_SHA256 -->
+			<xs:enumeration value="00A2"/>
+			<!-- TLS_DHE_DSS_WITH_AES_256_GCM_SHA384 -->
+			<xs:enumeration value="00A3"/>
+			<!-- TLS_DH_DSS_WITH_AES_128_GCM_SHA256 -->
+			<xs:enumeration value="00A4"/>
+			<!-- TLS_DH_DSS_WITH_AES_256_GCM_SHA384 -->
+			<xs:enumeration value="00A5"/>
+			<!-- TLS_ECDH_ECDSA_WITH_NULL_SHA -->
+			<xs:enumeration value="C001"/>
+			<!-- TLS_ECDH_ECDSA_WITH_RC4_128_SHA -->
+			<xs:enumeration value="C002"/>
+			<!-- TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA -->
+			<xs:enumeration value="C003"/>
+			<!-- TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA -->
+			<xs:enumeration value="C004 "/>
+			<!-- TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA -->
+			<xs:enumeration value="C005"/>
+			<!-- TLS_ECDHE_ECDSA_WITH_NULL_SHA -->
+			<xs:enumeration value="C006"/>
+			<!-- TLS_ECDHE_ECDSA_WITH_RC4_128_SHA -->
+			<xs:enumeration value="C007"/>
+			<!-- TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA -->
+			<xs:enumeration value="C008"/>
+			<!-- TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA -->
+			<xs:enumeration value="C009"/>
+			<!-- TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA -->
+			<xs:enumeration value="C00A"/>
+			<!-- TLS_ECDH_RSA_WITH_NULL_SHA -->
+			<xs:enumeration value="C00B"/>
+			<!-- TLS_ECDH_RSA_WITH_RC4_128_SHA -->
+			<xs:enumeration value="C00C"/>
+			<!-- TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA -->
+			<xs:enumeration value="C00D"/>
+			<!-- TLS_ECDH_RSA_WITH_AES_128_CBC_SHA -->
+			<xs:enumeration value="C00E"/>
+			<!-- TLS_ECDH_RSA_WITH_AES_256_CBC_SHA -->
+			<xs:enumeration value="C00F"/>
+			<!-- TLS_ECDHE_RSA_WITH_NULL_SHA -->
+			<xs:enumeration value="C010"/>
+			<!-- TLS_ECDHE_RSA_WITH_RC4_128_SHA -->
+			<xs:enumeration value="C011"/>
+			<!-- TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA -->
+			<xs:enumeration value="C012"/>
+			<!-- TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA -->
+			<xs:enumeration value="C013"/>
+			<!-- TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA -->
+			<xs:enumeration value="C014"/>
+			<!-- TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 -->
+			<xs:enumeration value="C023"/>
+			<!-- TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 -->
+			<xs:enumeration value="C024"/>
+			<!-- TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256 -->
+			<xs:enumeration value="C025"/>
+			<!-- TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384 -->
+			<xs:enumeration value="C026"/>
+			<!-- TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 -->
+			<xs:enumeration value="C027"/>
+			<!-- TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384 -->
+			<xs:enumeration value="C028"/>
+			<!-- TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256 -->
+			<xs:enumeration value="C029"/>
+			<!-- TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384 -->
+			<xs:enumeration value="C02A"/>
+			<!-- TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 -->
+			<xs:enumeration value="C02B"/>
+			<!-- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 -->
+			<xs:enumeration value="C02C"/>
+			<!-- TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256 -->
+			<xs:enumeration value="C02D"/>
+			<!-- TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384 -->
+			<xs:enumeration value="C02E"/>
+			<!-- TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 -->
+			<xs:enumeration value="C02F"/>
+			<!-- TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 -->
+			<xs:enumeration value="C030"/>
+			<!-- TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256 -->
+			<xs:enumeration value="C031"/>
+			<!-- TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384 -->
+			<xs:enumeration value="C032"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+
+	<!--********************** -->
+	<!--  Complex Types -->
+	<!--********************** -->
+
+
+</xs:schema>
diff --git a/v2_1_0/DCFG-dataCollection-v2_1_0.xsd b/v2_1_0/DCFG-dataCollection-v2_1_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..5d1e91d034447a49c266d1ab2b7e4e8a7b817360
--- /dev/null
+++ b/v2_1_0/DCFG-dataCollection-v2_1_0.xsd
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2017, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
+No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/deviceConfig" 
+	xmlns:m2m="http://www.onem2m.org/xml/protocols" 
+	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" 
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="unqualified" attributeFormDefault="unqualified">
+	
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	
+	
+	<xs:element name="dataCollection" substitutionGroup="m2m:sg_mgmtResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from data type "mgmtResource" -->
+				<xs:extension base="m2m:mgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="containerPath" type="m2m:ID" />
+						<xs:element name="reportingSchedule" type="m2m:scheduleEntries" minOccurs="0"/>
+						<xs:element name="measurementSchedule" type="m2m:scheduleEntries" minOccurs="0"/>
+						
+						<!-- Instantiations of this [dataCollection] resource type shall include mgmntLink's to
+	                         the following children:
+	                         0 or 1 mgmtLink to an instance of resource type [authenticationProfile]   -->
+						<xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="0" />
+            
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	
+	<xs:element name="dataCollectionAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
+				<xs:extension base="m2m:announcedMgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="containerPath" type="m2m:ID" minOccurs="0"/>
+						<xs:element name="reportingSchedule" type="m2m:scheduleEntries" minOccurs="0"/>
+						<xs:element name="measurementSchedule" type="m2m:scheduleEntries" minOccurs="0"/>
+						
+						<!-- Instantiations of this [dataCollection] resource type shall include mgmntLink's to
+	                         the following children:
+	                         0 or 1 mgmtLink to an instance of resource type [authenticationProfile]   -->
+						<xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="0" />
+						
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	
+</xs:schema>
diff --git a/v2_1_0/DCFG-myCertFileCred-v2_1_0.xsd b/v2_1_0/DCFG-myCertFileCred-v2_1_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..1100dd5ca83d09e3a4a2a5ed288951ab7c44e7a0
--- /dev/null
+++ b/v2_1_0/DCFG-myCertFileCred-v2_1_0.xsd
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2017, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
+No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/deviceConfig" 
+	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" 
+	xmlns:sec="http://www.onem2m.org/xml/securityProtocols"
+	
+	elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+	
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_9_0.xsd" />
+	
+	
+	<xs:element name="myCertFileCred" substitutionGroup="m2m:sg_mgmtResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from data type "mgmtResource" -->
+				<xs:extension base="m2m:mgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="SUIDs">
+							<xs:simpleType>
+								<xs:restriction>
+									<xs:simpleType>
+										<xs:list itemType="m2m:suid"/>
+									</xs:simpleType>
+									<xs:minLength value="1"/>
+								</xs:restriction>
+							</xs:simpleType>
+						</xs:element>
+						<xs:element name="myCertFileFormat" type="xs:anyURI" />
+						<xs:element name="myCertFileContent" type="xs:string" />
+						
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef"
+								maxOccurs="unbounded"/>
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded"/>
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	
+</xs:schema>
diff --git a/v2_1_0/DCFG-registration-v2_1_0.xsd b/v2_1_0/DCFG-registration-v2_1_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..63d5060ff4f566282ed08329a7553c7a6ddf0240
--- /dev/null
+++ b/v2_1_0/DCFG-registration-v2_1_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2017, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
+No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/deviceConfig" 
+	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" 
+	elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+	
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	
+	
+	<xs:element name="registration" substitutionGroup="m2m:sg_mgmtResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from data type "mgmtResource" -->
+				<xs:extension base="m2m:mgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="originatorID" type="m2m:ID" minOccurs="0"/>
+						<xs:element name="poA" type="xs:anyURI" />				
+						<xs:element name="appID" type="m2m:ID" minOccurs="0"/>					
+						<xs:element name="externalID" type="m2m:externalID" minOccurs="0"/>
+						<xs:element name="triggerRecipientID" type="m2m:triggerRecipientID" minOccurs="0"/>				
+						
+						<!-- Instantiations of this [registration] resource type shall include mgmntLink's to
+	                         the following children:
+	                         0 or 1 mgmtLink to an instance of resource type [authenticationProfile]   -->
+						<xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="0" />
+					
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	
+	<xs:element name="registrationAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
+				<xs:extension base="m2m:announcedMgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="originatorID" type="m2m:ID" minOccurs="0"/>
+						<xs:element name="poA" type="xs:anyURI" minOccurs="0"/>				
+						<xs:element name="appID" type="m2m:ID" minOccurs="0"/>					
+						<xs:element name="externalID" type="m2m:externalID" minOccurs="0"/>
+						<xs:element name="triggerRecipientID" type="m2m:triggerRecipientID" minOccurs="0"/>				
+						
+						<!-- Instantiations of this [registration] resource type shall include mgmntLink's to
+	                         the following children:
+	                         0 or 1 mgmtLink to an instance of resource type [authenticationProfile]   -->
+						<xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="0" />
+						
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	
+</xs:schema>
+
+
+
+
diff --git a/v2_1_0/DCFG-trustAnchorCred..v2_1_0.xsd b/v2_1_0/DCFG-trustAnchorCred..v2_1_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..75046bc82572e76f8e85dcf2601a887aaeac9db9
--- /dev/null
+++ b/v2_1_0/DCFG-trustAnchorCred..v2_1_0.xsd
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2017, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
+No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/deviceConfig" 
+	xmlns:m2m="http://www.onem2m.org/xml/protocols"  
+	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	
+	elementFormDefault="unqualified" attributeFormDefault="unqualified">
+	
+	<xs:include schemaLocation="DCFG-commonTypes-v2_1_0.xsd" />
+	
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+
+	
+	<xs:element name="trustAnchorCred" substitutionGroup="m2m:sg_mgmtResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from data type "mgmtResource" -->
+				<xs:extension base="m2m:mgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="certFingerprint" type="dcfg:niURI " />
+						<xs:element name="URI" type="xs:anyURI" />
+
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef"
+								maxOccurs="unbounded"/>
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded"/>
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	
+</xs:schema>