diff --git a/DCFG-MAFClientRegCfg.xsd b/DCFG-MAFClientRegCfg.xsd
index 8817ee5d474a42151aaa33d5a453d4796b23b702..56f254fd43feea9b71c848688c1eaaec01fa4887 100644
--- a/DCFG-MAFClientRegCfg.xsd
+++ b/DCFG-MAFClientRegCfg.xsd
@@ -23,9 +23,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-MEFClientRegCfg.xsd b/DCFG-MEFClientRegCfg.xsd
index 6d1259627c1d21f9b817fe4b0f5509dbd0004470..aa7c8f9137144e4c8a82a477bfed1db786215a34 100644
--- a/DCFG-MEFClientRegCfg.xsd
+++ b/DCFG-MEFClientRegCfg.xsd
@@ -23,9 +23,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-OAuth2.xsd b/DCFG-OAuth2.xsd
index 67ae219d040e522ce9fa97c75232154135db9a6c..94dc692ddfd372faf257e452d4d34e1555a0127e 100644
--- a/DCFG-OAuth2.xsd
+++ b/DCFG-OAuth2.xsd
@@ -22,9 +22,9 @@ ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCI
 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="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-authenticationProfile.xsd b/DCFG-authenticationProfile.xsd
index e186d7fbcedf7996267a22ce24f4889bb802412f..a70a4aef9055f1ee5316e098adeff053a1732ac0 100644
--- a/DCFG-authenticationProfile.xsd
+++ b/DCFG-authenticationProfile.xsd
@@ -22,9 +22,9 @@ ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCI
 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="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-commonTypes.xsd b/DCFG-commonTypes.xsd
index 406d7188087dc8f39f4c90a7661fd0d346ae809b..f0d87b4b86a310c669c47d0033ec56b18d4dbcdc 100644
--- a/DCFG-commonTypes.xsd
+++ b/DCFG-commonTypes.xsd
@@ -23,8 +23,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1"
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
 	<!-- <xs:include schemaLocation="CDT-enumerationTypes" />  -->
diff --git a/DCFG-dataCollection.xsd b/DCFG-dataCollection.xsd
index b11b466dbc099d02a8013f3e038676f9d84bf156..2bae75e29c9dd72c5fc06c1e748be20905685df6 100644
--- a/DCFG-dataCollection.xsd
+++ b/DCFG-dataCollection.xsd
@@ -23,9 +23,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
diff --git a/DCFG-myCertFileCred.xsd b/DCFG-myCertFileCred.xsd
index e453292a9c5af248ccab59562073c5b5f5683fb0..7b37217dbcdd390a23f6377da937059c3e82e3ad 100644
--- a/DCFG-myCertFileCred.xsd
+++ b/DCFG-myCertFileCred.xsd
@@ -23,8 +23,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" 
-	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
 	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
diff --git a/DCFG-registration.xsd b/DCFG-registration.xsd
index 0b5b3db72291c2ae4301d265a914e2eba82b17ce..de4bfa480349df47d8414542fc046024298f0a5b 100644
--- a/DCFG-registration.xsd
+++ b/DCFG-registration.xsd
@@ -23,8 +23,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" 
-	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
 	elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
 	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
@@ -39,7 +39,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<!-- Resource Specific Attributes -->
 					<xs:sequence>
 						<xs:element name="originatorID" type="m2m:ID" minOccurs="0"/>
-						<xs:element name="poA" type="xs:anyURI" />				
+						<xs:element name="pointOfAccess" type="m2m:poaList" minOccurs="0"/>				
+						<xs:element name="CSEBase" type="xs:anyURI" minOccurs="0"/>				
+						<xs:element name="CSE-ID" type="m2m:ID" 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"/>				
@@ -68,7 +70,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<!-- 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="pointOfAccess" type="m2m:poaList" minOccurs="0"/>				
+						<xs:element name="CSEBase" type="xs:anyURI" minOccurs="0"/>				
+						<xs:element name="CSE-ID" type="m2m:ID" 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"/>				
diff --git a/DCFG-trustAnchorCred.xsd b/DCFG-trustAnchorCred.xsd
index 38a900de5488f1c13eb39290e239c32bdd5a6836..3c6fb79a740a6175dd8f93034e1bcc65bd0f5011 100644
--- a/DCFG-trustAnchorCred.xsd
+++ b/DCFG-trustAnchorCred.xsd
@@ -23,9 +23,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-wifiClient.xsd b/DCFG-wifiClient.xsd
index 5da102498adf29b52724a00a72ead84a0fe03780..693da1cdcf001d21d71934aa8b74a05ad0d0b433 100644
--- a/DCFG-wifiClient.xsd
+++ b/DCFG-wifiClient.xsd
@@ -22,9 +22,9 @@ ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCI
 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="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">