diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/LeshanServerDemo.java b/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/LeshanServerDemo.java
index 36ec309a07..fff17687b0 100644
--- a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/LeshanServerDemo.java
+++ b/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/LeshanServerDemo.java
@@ -75,8 +75,8 @@ public class LeshanServerDemo {
     private static final Logger LOG = LoggerFactory.getLogger(LeshanServerDemo.class);
 
     private final static String[] modelPaths = new String[] { "LWM2M_Lock_and_Wipe-V1_0.xml",
-                            "LWM2M_Cellular_connectivity-V1_0.xml", "LWM2M_APN_connection_profile-V1_0.xml",
-                            "LWM2M_WLAN_connectivity4-v1_0.xml", "LWM2M_Bearer_selection-V1_0.xml",
+                            "LWM2M_Cellular_connectivity-v1_0.xml", "LWM2M_APN_connection_profile-v1_0.xml",
+                            "LWM2M_WLAN_connectivity4-v1_0.xml", "LWM2M_Bearer_selection-v1_0.xml",
                             "LWM2M_Portfolio-v1_0.xml", "Communication_Characteristics-V1_0.xml",
                             "Non-Access_Stratum_NAS_configuration-V1_0.xml", "3200.xml", "3201.xml", "3202.xml",
                             "3203.xml", "3300.xml", "3301.xml", "3302.xml", "3303.xml", "3304.xml", "3305.xml",
@@ -86,7 +86,11 @@ public class LeshanServerDemo {
                             "3329.xml", "3330.xml", "3331.xml", "3332.xml", "3333.xml", "3334.xml", "3335.xml",
                             "3336.xml", "3337.xml", "3338.xml", "3339.xml", "3340.xml", "3341.xml", "3342.xml",
                             "3343.xml", "3344.xml", "3345.xml", "3346.xml", "3347.xml", "3348.xml", "singlePhasePM.xml",
-                            "VehicleControlUnit.xml", "Application-Data-Container.xml" };
+                            "VehicleControlUnit.xml", "Application-Data-Container.xml", "LWM2M_DevCapMgmt-v1_0.xml",
+                            "LWM2M_Software_Component-v1_0.xml", "LWM2M_Software_Management-v1_0.xml",
+                            "3-PhasePM.xml", "ActiveCmdhPolicy.xml", "CmdhBackOffParametersSet.xml", "CmdhBuffer.xml",
+                            "CmdhDefaults.xml", "CmdhDefEcValues.xml", "CmdhEcDefParamValues.xml", "CmdhLimits.xml",
+                            "CmdhNetworkAccessRules.xml", "CmdhNwAccessRule.xml", "CmdhPolicy.xml" };
 
     private final static String USAGE = "java -jar leshan-server-demo.jar [OPTION]";
 
diff --git a/leshan-server-demo/src/main/resources/models/3-PhasePM.xml b/leshan-server-demo/src/main/resources/models/3-PhasePM.xml
new file mode 100644
index 0000000000..e3a471b624
--- /dev/null
+++ b/leshan-server-demo/src/main/resources/models/3-PhasePM.xml
@@ -0,0 +1,629 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd" >
+<Object ObjectType="MODefinition">
+    <Name>3-Phase Power Meter</Name>
+    <Description1>
+        <![CDATA[This Object provides the information to represent a generic 3-Phase Power Meter.]]>
+    </Description1>
+    <ObjectID>10242</ObjectID>
+    <ObjectURN>urn:oma:lwm2m:x:10242</ObjectURN>
+    <MultipleInstances>Multiple</MultipleInstances>
+    <Mandatory>Optional</Mandatory>
+    <Resources>
+        <Item ID="0">
+            <Name>Manufacturer</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>String</Type>
+            <RangeEnumeration/>
+            <Units/>
+            <Description>
+                <![CDATA[Human readable manufacturer name]]>
+            </Description>
+        </Item>
+        <Item ID="1">
+            <Name>Model Number</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>String</Type>
+            <RangeEnumeration/>
+            <Units/>
+            <Description>
+                <![CDATA[A model identifier (manufacturer specified string)]]>
+            </Description>
+        </Item>
+        <Item ID="2">
+            <Name>Serial Number</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>String</Type>
+            <RangeEnumeration/>
+            <Units/>
+            <Description>
+                <![CDATA[Serial number of the meter]]>
+            </Description>
+        </Item>
+        <Item ID="3">
+            <Name>Description</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>String</Type>
+            <RangeEnumeration/>
+            <Units/>
+            <Description>
+                <![CDATA[Description of the meter]]>
+            </Description>
+        </Item>
+        <Item ID="4">
+            <Name>Tension R</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Mandatory</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>V</Units>
+            <Description>
+                <![CDATA[Voltage phase 1 (phase to neutral)]]>
+            </Description>
+        </Item>
+        <Item ID="5">
+            <Name>Current R</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Mandatory</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>A</Units>
+            <Description>
+                <![CDATA[Current phase 1]]>
+            </Description>
+        </Item>
+        <Item ID="6">
+            <Name>Active Power R</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kW</Units>
+            <Description>
+                <![CDATA[Active Power phase 1]]>
+            </Description>
+        </Item>
+        <Item ID="7">
+            <Name>Reactive Power R</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kvar</Units>
+            <Description>
+                <![CDATA[Reactive Power phase 1]]>
+            </Description>
+        </Item>
+        <Item ID="8">
+            <Name>Inductive Reactive Power R</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kvarL</Units>
+            <Description>
+                <![CDATA[Inductive Reactive Power phase 1]]>
+            </Description>
+        </Item>
+        <Item ID="9">
+            <Name>Capacitive Reactive Power R</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kvarC</Units>
+            <Description>
+                <![CDATA[Capacitive Reactive Power phase 1]]>
+            </Description>
+        </Item>
+        <Item ID="10">
+            <Name>Apparent Power R</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kVA</Units>
+            <Description>
+                <![CDATA[Apparent Power phase 1]]>
+            </Description>
+        </Item>
+        <Item ID="11">
+            <Name>Power Factor R</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration>-1..1</RangeEnumeration>
+            <Units/>
+            <Description>
+                <![CDATA[Power Factor phase 1]]>
+            </Description>
+        </Item>
+        <Item ID="12">
+            <Name>THD-V R</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>%</Units>
+            <Description>
+                <![CDATA[Total Harmonic Distortion phase 1 (Tension)]]>
+            </Description>
+        </Item>
+        <Item ID="13">
+            <Name>THD-A R</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>%</Units>
+            <Description>
+                <![CDATA[Total Harmonig Distortion phase 1 (Current)]]>
+            </Description>
+        </Item>
+        <Item ID="14">
+            <Name>Tension S</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Mandatory</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>V</Units>
+            <Description>
+                <![CDATA[Voltage phase 2 (phase to neutral)]]>
+            </Description>
+        </Item>
+        <Item ID="15">
+            <Name>Current S</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Mandatory</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>A</Units>
+            <Description>
+                <![CDATA[Current phase 2]]>
+            </Description>
+        </Item>
+        <Item ID="16">
+            <Name>Active Power S</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kW</Units>
+            <Description>
+                <![CDATA[Active Power phase 2]]>
+            </Description>
+        </Item>
+        <Item ID="17">
+            <Name>Reactive Power S</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kvar</Units>
+            <Description>
+                <![CDATA[Reactive Power phase 2]]>
+            </Description>
+        </Item>
+        <Item ID="18">
+            <Name>Inductive Reactive Power S</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kvarL</Units>
+            <Description>
+                <![CDATA[Inductive Reactive Power phase 2]]>
+            </Description>
+        </Item>
+        <Item ID="19">
+            <Name>Capacitive Reactive Power S</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kvarC</Units>
+            <Description>
+                <![CDATA[Capacitive Reactive Power phase 2]]>
+            </Description>
+        </Item>
+        <Item ID="20">
+            <Name>Apparent Power S</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kVA</Units>
+            <Description>
+                <![CDATA[Apparent Power phase 2]]>
+            </Description>
+        </Item>
+        <Item ID="21">
+            <Name>Power Factor S</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration>-1..1</RangeEnumeration>
+            <Units/>
+            <Description>
+                <![CDATA[Power Factor phase 2]]>
+            </Description>
+        </Item>
+        <Item ID="22">
+            <Name>THD-V S</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>%</Units>
+            <Description>
+                <![CDATA[Total Harmonic Distortion phase 2 (Tension)]]>
+            </Description>
+        </Item>
+        <Item ID="23">
+            <Name>THD-A S</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>%</Units>
+            <Description>
+                <![CDATA[Total Harmonic Distortion phase 2 (Current)]]>
+            </Description>
+        </Item>
+        <Item ID="24">
+            <Name>Tension T</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Mandatory</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>V</Units>
+            <Description>
+                <![CDATA[Voltage phase 3 (phase to neutral)]]>
+            </Description>
+        </Item>
+        <Item ID="25">
+            <Name>Current T</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Mandatory</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>A</Units>
+            <Description>
+                <![CDATA[Current phase 3]]>
+            </Description>
+        </Item>
+        <Item ID="26">
+            <Name>Active Power T</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kW</Units>
+            <Description>
+                <![CDATA[Active Power phase 3]]>
+            </Description>
+        </Item>
+        <Item ID="27">
+            <Name>Reactive Power T</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kvar</Units>
+            <Description>
+                <![CDATA[Reactive Power phase 3]]>
+            </Description>
+        </Item>
+        <Item ID="28">
+            <Name>Inductive Reactive Power T</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kvarL</Units>
+            <Description>
+                <![CDATA[Inductive Reactive Power phase 3]]>
+            </Description>
+        </Item>
+        <Item ID="29">
+            <Name>Capacitive Reactive Power T</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kvarC</Units>
+            <Description>
+                <![CDATA[Capacitive Reactive Power phase 3]]>
+            </Description>
+        </Item>
+        <Item ID="30">
+            <Name>Apparent Power T</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kVA</Units>
+            <Description>
+                <![CDATA[Apparent Power phase 3]]>
+            </Description>
+        </Item>
+        <Item ID="31">
+            <Name>Power Factor T</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration>-1..1</RangeEnumeration>
+            <Units/>
+            <Description>
+                <![CDATA[Power Factor phase 3]]>
+            </Description>
+        </Item>
+        <Item ID="32">
+            <Name>THD-V T</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>%</Units>
+            <Description>
+                <![CDATA[Total Harmonic Distortion phase 3 (Tension)]]>
+            </Description>
+        </Item>
+        <Item ID="33">
+            <Name>THD-A T</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>%</Units>
+            <Description>
+                <![CDATA[Total Harmonic Distortion phase 3 (Current)]]>
+            </Description>
+        </Item>
+        <Item ID="34">
+            <Name>3-Phase Active Power</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kW III</Units>
+            <Description>
+                <![CDATA[3-Phase Active Power]]>
+            </Description>
+        </Item>
+        <Item ID="35">
+            <Name>3-Phase Reactive Power</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kvar III</Units>
+            <Description>
+                <![CDATA[3-Phase Reactive Power]]>
+            </Description>
+        </Item>
+        <Item ID="36">
+            <Name>3-Phase Inductive Reactive Power</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kvarL III</Units>
+            <Description>
+                <![CDATA[3-Phase Inductive Reactive Power]]>
+            </Description>
+        </Item>
+        <Item ID="37">
+            <Name>3-Phase Capacitive Reactive Power</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kvarC III</Units>
+            <Description>
+                <![CDATA[3-Phase Capacitive Reactive Power]]>
+            </Description>
+        </Item>
+        <Item ID="38">
+            <Name>3-Phase Apparent Power</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kVA III</Units>
+            <Description>
+                <![CDATA[3-Phase Apparent Power]]>
+            </Description>
+        </Item>
+        <Item ID="39">
+            <Name>3-Phase Power Factor</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration>-1..1</RangeEnumeration>
+            <Units/>
+            <Description>
+                <![CDATA[3-Phase Power Factor]]>
+            </Description>
+        </Item>
+        <Item ID="40">
+            <Name>3-Phase phi cosine</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration>-1..1</RangeEnumeration>
+            <Units/>
+            <Description>
+                <![CDATA[3-Phase phi cosine]]>
+            </Description>
+        </Item>
+        <Item ID="41">
+            <Name>Active Energy</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kW/h III</Units>
+            <Description>
+                <![CDATA[Active Energy]]>
+            </Description>
+        </Item>
+        <Item ID="42">
+            <Name>Reactive Energy</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kvar/h III</Units>
+            <Description>
+                <![CDATA[Reactive Energy]]>
+            </Description>
+        </Item>
+        <Item ID="43">
+            <Name>Inductive Reactive Energy</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kvarL/h III</Units>
+            <Description>
+                <![CDATA[Inductive Reactive Energy]]>
+            </Description>
+        </Item>
+        <Item ID="44">
+            <Name>Capacitive Reactive Energy</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kvarC/h III</Units>
+            <Description>
+                <![CDATA[Capacitive Reactive Energy]]>
+            </Description>
+        </Item>
+        <Item ID="45">
+            <Name>Apparent Energy</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>kVA/h III</Units>
+            <Description>
+                <![CDATA[Apparent Energy]]>
+            </Description>
+        </Item>
+        <Item ID="46">
+            <Name>Tension R-S</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>V</Units>
+            <Description>
+                <![CDATA[Voltage phase 1 to phase 2]]>
+            </Description>
+        </Item>
+        <Item ID="47">
+            <Name>Tension S-T</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>V</Units>
+            <Description>
+                <![CDATA[Voltage phase 2 to phase 3]]>
+            </Description>
+        </Item>
+        <Item ID="48">
+            <Name>Tension T-R</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>V</Units>
+            <Description>
+                <![CDATA[Voltage phase 3 to phase 1]]>
+            </Description>
+        </Item>
+        <Item ID="49">
+            <Name>Frequency</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>Hz</Units>
+            <Description>
+                <![CDATA[Frequency]]>
+            </Description>
+        </Item>
+        <Item ID="50">
+            <Name>Neutral Current</Name>
+            <Operations>R</Operations>
+            <MultipleInstances>Single</MultipleInstances>
+            <Mandatory>Optional</Mandatory>
+            <Type>Float</Type>
+            <RangeEnumeration/>
+            <Units>A</Units>
+            <Description>
+                <![CDATA[Neutral Current]]>
+            </Description>
+        </Item>
+    </Resources>
+    <Description2/>
+</Object>
+</LWM2M>
diff --git a/leshan-server-demo/src/main/resources/models/ActiveCmdhPolicy.xml b/leshan-server-demo/src/main/resources/models/ActiveCmdhPolicy.xml
new file mode 100644
index 0000000000..10cf638ff7
--- /dev/null
+++ b/leshan-server-demo/src/main/resources/models/ActiveCmdhPolicy.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>ActiveCmdhPolicy</Name>
+		<Description1><![CDATA[This Object provides a link to the currently active set of CMDH policies]]></Description1>
+		<ObjectID>2049</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:ext:2049</ObjectURN><LWM2MVersion>1.0</LWM2MVersion>
+		<ObjectVersion>1.0</ObjectVersion><MultipleInstances>Single</MultipleInstances>
+		<Mandatory>Optional</Mandatory>
+		<Resources>
+			<Item ID="0"><Name>ActiveLink</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains the reference to the CMDH policies (CmdhPolicy Object Instance) currently active for the associated CSE.]]></Description>
+			</Item>
+			
+			
+			
+			
+			</Resources>
+		<Description2 />
+	</Object>
+</LWM2M>
\ No newline at end of file
diff --git a/leshan-server-demo/src/main/resources/models/CmdhBackOffParametersSet.xml b/leshan-server-demo/src/main/resources/models/CmdhBackOffParametersSet.xml
new file mode 100644
index 0000000000..2ec0927f8c
--- /dev/null
+++ b/leshan-server-demo/src/main/resources/models/CmdhBackOffParametersSet.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?><LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>CmdhBackOffParametersSet</Name>
+		<Description1><![CDATA[This Object defines set of parameters which can be referenced by a specific Instance of the CmdhNwAccessRule Object (ID: 2055)]]></Description1>
+		<ObjectID>2057</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:ext:2057</ObjectURN>
+		<LWM2MVersion>1.0</LWM2MVersion>
+		<ObjectVersion>1.0</ObjectVersion>
+		<MultipleInstances>Multiple</MultipleInstances>
+		<Mandatory>Optional</Mandatory>
+		<Resources>
+			<Item ID="0"><Name>NetworkAction</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>1..5</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains specific action actually  attempted on the network (e.g. cellular-registration)]]></Description>
+			</Item>
+			<Item ID="1"><Name>InitialBackoffTime</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>ms</Units>
+				<Description><![CDATA[Regarding the BackOffParameters of a certain CmdhNwAccessRule  Object Instance, this Resource contains the value for the Initial wait time. ]]></Description>
+			</Item>
+			<Item ID="2"><Name>AdditionalBackoffTime</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>ms</Units>
+				<Description><![CDATA[Regarding the BackOffParameters of a certain CmdhNwAccessRule  Object Instance, this Resource contains the value for an additional wait tme.]]></Description>
+			</Item>
+			<Item ID="3"><Name>MaximumBackoffTime</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>ms</Units>
+				<Description><![CDATA[Regarding the BackOffParameters of a certain CmdhNwAccessRule  Object Instance, this Resource contains the value for the maximum wait time]]></Description>
+			</Item>
+			<Item ID="4"><Name>OptionalRandomBackoffTime</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>ms</Units>
+				<Description><![CDATA[Regarding the BackOffParameters of a certain CmdhNwAccessRule  Object Instance, this Resource contains the value for an optional random wait time.]]></Description>
+			</Item></Resources>
+		<Description2 />
+	</Object>
+</LWM2M>
\ No newline at end of file
diff --git a/leshan-server-demo/src/main/resources/models/CmdhBuffer.xml b/leshan-server-demo/src/main/resources/models/CmdhBuffer.xml
new file mode 100644
index 0000000000..f0585118e9
--- /dev/null
+++ b/leshan-server-demo/src/main/resources/models/CmdhBuffer.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>CmdhBuffer</Name>
+		<Description1><![CDATA[This Object defines limits in usage of buffers for temporarily storing information that needs to be forwarded to other CSEs during processing of CMDH-related requests in a CSE.]]></Description1>
+		<ObjectID>2056</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:ext:2056</ObjectURN><LWM2MVersion>1.0</LWM2MVersion>
+		<ObjectVersion>1.0</ObjectVersion><MultipleInstances>Multiple</MultipleInstances>
+		<Mandatory>Optional</Mandatory>
+		<Resources>
+			<Item ID="0"><Name>ApplicableEventCategory</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains a list of event category values]]></Description>
+			</Item>
+			<Item ID="1"><Name>MaxBufferSize</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>Byte</Units>
+				<Description><![CDATA[Contains the max Buffer size of the CmdhBuffer Object Instance ]]></Description>
+			</Item>
+			<Item ID="2"><Name>StoragePriority</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>1..10</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Storage priority for the buffered data associated to that CmdhBuffer Object Instance. t 
+Buffered requests associated with a lower storage priority shall be purged before buffered requests with a higher storage priority.
+]]></Description>
+			</Item>
+			
+			
+			</Resources>
+		<Description2 />
+	</Object>
+</LWM2M>
\ No newline at end of file
diff --git a/leshan-server-demo/src/main/resources/models/CmdhDefEcValues.xml b/leshan-server-demo/src/main/resources/models/CmdhDefEcValues.xml
new file mode 100644
index 0000000000..abfa655a68
--- /dev/null
+++ b/leshan-server-demo/src/main/resources/models/CmdhDefEcValues.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?><LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>CmdhDefEcValues</Name>
+		<Description1><![CDATA[This Object represents default set of values for the Event Category parameter of an incoming request or response message.]]></Description1>
+		<ObjectID>2051</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:ext:2051</ObjectURN><LWM2MVersion>1.0</LWM2MVersion>
+		<ObjectVersion>1.0</ObjectVersion><MultipleInstances>Multiple</MultipleInstances>
+		<Mandatory>Optional</Mandatory>
+		<Resources>
+			<Item ID="0"><Name>Order</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains an index defining the order of processing this CmdhDefEcValue Object Instance will be handled]]></Description>
+			</Item>
+			<Item ID="1"><Name>DefEcValue</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Represents the default Event category value to be applied when the conditions given in this Object Instance are matched]]></Description>
+			</Item>
+			<Item ID="2"><Name>RequestOrigin</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[List of zero or more Local AE-IDs, App-IDs, or the strings “localAE” or “thisCSE”]]></Description>
+			</Item>
+			<Item ID="3"><Name>RequestContext</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains the requestContext information of this Object Instance which needs to be matched  ]]></Description>
+			</Item>
+			<Item ID="4"><Name>RequestContextNotification</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Boolean</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains true/false flag indicating whether or not notification procedures apply.]]></Description>
+			</Item>
+			<Item ID="5"><Name>RequestCharacteristics</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Represents conditions pertaining to the request itself, (e.g. the requested Response Type  ) than needs to be matched]]></Description>
+			</Item></Resources>
+		<Description2 />
+	</Object>
+</LWM2M>
\ No newline at end of file
diff --git a/leshan-server-demo/src/main/resources/models/CmdhDefaults.xml b/leshan-server-demo/src/main/resources/models/CmdhDefaults.xml
new file mode 100644
index 0000000000..fc65f844b9
--- /dev/null
+++ b/leshan-server-demo/src/main/resources/models/CmdhDefaults.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?><LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>CmdhDefaults</Name>
+		<Description1><![CDATA[Defines which CMDH related parameters will be used by default. ]]></Description1>
+		<ObjectID>2050</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:ext:2050</ObjectURN><LWM2MVersion>1.0</LWM2MVersion>
+		<ObjectVersion>1.0</ObjectVersion><MultipleInstances>Multiple</MultipleInstances>
+		<Mandatory>Optional</Mandatory>
+		<Resources>
+			<Item ID="0"><Name>DefaultEcRules</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[1 or more references to  CmdhDefEcValue Object Instances containing default values for the ec (event category) parameter of an incoming request or response when this parameter is not indicated in the message itself ]]></Description>
+			</Item>
+			
+			
+			
+			
+			
+			<Item ID="1"><Name>DefaultEcParamRules</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[1 or more references to CmdhEcDefParamValues Object Instances ]]></Description>
+			</Item></Resources>
+		<Description2 />
+	</Object>
+</LWM2M>
\ No newline at end of file
diff --git a/leshan-server-demo/src/main/resources/models/CmdhEcDefParamValues.xml b/leshan-server-demo/src/main/resources/models/CmdhEcDefParamValues.xml
new file mode 100644
index 0000000000..7df5acd2de
--- /dev/null
+++ b/leshan-server-demo/src/main/resources/models/CmdhEcDefParamValues.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?><LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>CmdhEcDefParamValues</Name>
+		<Description1><![CDATA[This Object represents a specific set of default values for the CMDH related parameters Request Expiration Timestamp, Result Expiration Timestamp, Operational Execution Time, Result Persistence and Delivery Aggregation that are applicable for a given Event Category if these parameters are not specified in the message.]]></Description1>
+		<ObjectID>2052</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:ext:2052</ObjectURN><LWM2MVersion>1.0</LWM2MVersion>
+		<ObjectVersion>1.0</ObjectVersion><MultipleInstances>Multiple</MultipleInstances>
+		<Mandatory>Optional</Mandatory>
+		<Resources>
+			<Item ID="0"><Name>ApplicableEventCategory </Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains  list of Event Category values]]></Description>
+			</Item>
+			<Item ID="1"><Name>DefaultRequestExpTime</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>ms</Units>
+				<Description><![CDATA[Contains the default value for the Request Expiration Timestamp parameter when such a parameter is not set in the request]]></Description>
+			</Item>
+			
+			
+			
+			
+			
+			
+			<Item ID="2"><Name>DefaultResultExpTime </Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>ms</Units>
+				<Description><![CDATA[Contains the default value of the Result  Expiration Timestamp parameter when such a parameter is not set in the request  ]]></Description>
+			</Item>
+			
+			<Item ID="3"><Name>DefaultOpExecTime</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>ms</Units>
+				<Description><![CDATA[Contains the default value of the Operation Execution Time parameter when such a parameter is not set in the request]]></Description>
+			</Item>
+			<Item ID="4"><Name>DefaultRespPersistence </Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>ms</Units>
+				<Description><![CDATA[Contains the default value of the Result  Persistence parameter when such a parameter is not set in the request  ]]></Description>
+			</Item>
+			<Item ID="5"><Name>DefaultDelAggregation </Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>ms</Units>
+				<Description><![CDATA[Contains the default value of the Delivery Aggregation  parameter when such a parameter is not set in the request  ]]></Description>
+			</Item>
+			
+			
+			
+			
+			</Resources>
+		<Description2 />
+	</Object>
+</LWM2M>
\ No newline at end of file
diff --git a/leshan-server-demo/src/main/resources/models/CmdhLimits.xml b/leshan-server-demo/src/main/resources/models/CmdhLimits.xml
new file mode 100644
index 0000000000..af2739aaad
--- /dev/null
+++ b/leshan-server-demo/src/main/resources/models/CmdhLimits.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?><LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>CmdhLimits</Name>
+		<Description1><![CDATA[This Object represents limits for CMDH related parameter values. ]]></Description1>
+		<ObjectID>2053</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:ext:2053</ObjectURN><LWM2MVersion>1.0</LWM2MVersion>
+		<ObjectVersion>1.0</ObjectVersion><MultipleInstances>Multiple</MultipleInstances>
+		<Mandatory>Optional</Mandatory>
+		<Resources>
+			<Item ID="0"><Name>Order</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains index indicating in which order the concerned CmdhLimits Object Instance will be treated by the CSE to determine a value for the limit parameters.]]></Description>
+			</Item>
+			<Item ID="1"><Name>RequestOrigin</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[List of zero or more Local AE-IDs, App-IDs, or the strings “localAE” or “thisCSE”]]></Description>
+			</Item>
+			
+			
+			
+			
+			
+			
+			<Item ID="2"><Name>RequestContext</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Represents the Dynamic Context condition under which CMDH parameter limits defined inside the concerned CmdhLimits Object Instance is applicable.]]></Description>
+			</Item>
+			
+			<Item ID="3"><Name>RequestContextNotificatio</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Boolean</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains true/false flag indicating whether or not notification procedures apply.]]></Description>
+			</Item>
+			<Item ID="4"><Name>RequestCharacteristics</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Represents conditions pertaining to the request itself, (e.g. the requested Response Type  ) than needs to be matched]]></Description>
+			</Item>
+			<Item ID="5"><Name>LimitsEventCategory</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Allowed values for the Event Category parameter in a request of any of the Originators indicated in the requestOrigin attribute.]]></Description>
+			</Item>
+			<Item ID="6"><Name>LimitsRequestExpTime </Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>2 Instances</RangeEnumeration>
+				<Units>ms</Units>
+				<Description><![CDATA[Defines a range of values for the Request Expiration Time parameter for a request of any Originator indicated in the requestOrigin Resource
+Inst 0 : minTime
+Inst 1:  maxTime
+ ]]></Description>
+			</Item>
+			<Item ID="7"><Name>LimitsResultExpTime</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>2 Instances</RangeEnumeration>
+				<Units>ms</Units>
+				<Description><![CDATA[Defines a range of values for the Result Expiration Time parameter for a request of any Originator indicated in the requestOrigin Resource
+Inst 0 : minTime
+Inst 1:  maxTime
+]]></Description>
+			</Item>
+			<Item ID="8"><Name>LimitsOptExpTime</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>2 Instances</RangeEnumeration>
+				<Units>ms</Units>
+				<Description><![CDATA[Defines a range of values for the Operation Expiration Time parameter for a request of any Originator indicated in the requestOrigin Resource
+Inst 0 : minTime
+Inst 1:  maxTime
+]]></Description>
+			</Item>
+			<Item ID="9"><Name>LimitsRespPersistence</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>2 Instances</RangeEnumeration>
+				<Units>ms</Units>
+				<Description><![CDATA[Defines a range of values for the Result Persistence parameter for a request of any Originator indicated in the requestOrigin Resource
+Inst 0 : minTime
+Inst 1:  maxTime
+]]></Description>
+			</Item>
+			<Item ID="10"><Name>LimitsDelAggregation</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains the permitted settings of the DeliveryAggregation parameter of request primitives. 
+'0' means 'False' '1' means 'True' '0 1' means 'False' or 'True'
+]]></Description>
+			</Item></Resources>
+		<Description2 />
+	</Object>
+</LWM2M>
\ No newline at end of file
diff --git a/leshan-server-demo/src/main/resources/models/CmdhNetworkAccessRules.xml b/leshan-server-demo/src/main/resources/models/CmdhNetworkAccessRules.xml
new file mode 100644
index 0000000000..eeeebb3001
--- /dev/null
+++ b/leshan-server-demo/src/main/resources/models/CmdhNetworkAccessRules.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>CmdhNetworkAccessRules</Name>
+		<Description1><![CDATA[This Object defines the usage of underlying networks for forwarding information to other CSEs during processing of CMDH-related requests in a CSE.]]></Description1>
+		<ObjectID>2054</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:ext:2054</ObjectURN><LWM2MVersion>1.0</LWM2MVersion>
+		<ObjectVersion>1.0</ObjectVersion><MultipleInstances>Multiple</MultipleInstances>
+		<Mandatory>Optional</Mandatory>
+		<Resources>
+			<Item ID="0"><Name>ApplicableEventCategories</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains  a list of Event Category values]]></Description>
+			</Item>
+			<Item ID="1"><Name>NetworkAccessRule</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains 0 or more references to CmdhNwAccessRule Object Instances ]]></Description>
+			</Item>
+			
+			
+			
+			
+			
+			</Resources>
+		<Description2 />
+	</Object>
+</LWM2M>
\ No newline at end of file
diff --git a/leshan-server-demo/src/main/resources/models/CmdhNwAccessRule.xml b/leshan-server-demo/src/main/resources/models/CmdhNwAccessRule.xml
new file mode 100644
index 0000000000..18598be8d3
--- /dev/null
+++ b/leshan-server-demo/src/main/resources/models/CmdhNwAccessRule.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?><LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>CmdhNwAccessRule</Name>
+		<Description1><![CDATA[This Object defines limits in usage of specific underlying networks for forwarding information to other CSEs during processing of CMDH-related requests in a CSE.]]></Description1>
+		<ObjectID>2055</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:ext:2055</ObjectURN><LWM2MVersion>1.0</LWM2MVersion>
+		<ObjectVersion>1.0</ObjectVersion><MultipleInstances>Multiple</MultipleInstances>
+		<Mandatory>Optional</Mandatory>
+		<Resources>
+			<Item ID="0"><Name>TargetNetwork</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains identifiers of Underlying networks]]></Description>
+			</Item>
+			<Item ID="1"><Name>SpreadingWaitTime</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>ms</Units>
+				<Description><![CDATA[Contains a value in ms such that before accessing the underlying network (typically to forward an incoming request), the CSE will wait for an additional amount of time randomly chosen between 0 and this value]]></Description>
+			</Item>
+			<Item ID="2"><Name>MinReqVolume</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>Byte</Units>
+				<Description><![CDATA[Minimum amount of data that needs to be aggregated before any of the Underlying Networks matching with the targetNetwork Resource of the current Instance of the  CmdhNwAccessRule Object can be used for forwarding information to other CSEs.]]></Description>
+			</Item>
+			<Item ID="3"><Name>BackOffParameters</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Reference to an Instance of BackOffParameterSet Object defining parameters that define how usage of any of the Underlying Networks matching with the targetNetwork Resource  of that Object Instance, shall be handled when attempts to use such networks have failed.
+]]></Description>
+			</Item>
+			<Item ID="4"><Name>OtherConditions</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[List of additional conditions that need to be fulfilled before any of the Underlying Networks matching with the TargetNetwork Resource of this CmdhNwAccessRule Object Instance can be used for forwarding information to other CSEs. ]]></Description>
+			</Item>
+			<Item ID="5"><Name>AllowedSchedule</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains time schedules in form of extended crontab syntax defined in oneM2M Protocol TS-0004 ]]></Description>
+			</Item></Resources>
+		<Description2 />
+	</Object>
+</LWM2M>
\ No newline at end of file
diff --git a/leshan-server-demo/src/main/resources/models/CmdhPolicy.xml b/leshan-server-demo/src/main/resources/models/CmdhPolicy.xml
new file mode 100644
index 0000000000..7d8f4ea65b
--- /dev/null
+++ b/leshan-server-demo/src/main/resources/models/CmdhPolicy.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?><LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>CmdhPolicy</Name>
+		<Description1><![CDATA[This Object provides links to a set of rules associated with a specific CSE that governs the behavior of that CSE regarding rejecting, buffering and sending request or response messages via the Mcc reference point.]]></Description1>
+		<ObjectID>2048</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:ext:2048</ObjectURN><LWM2MVersion>1.0</LWM2MVersion>
+		<ObjectVersion>1.0</ObjectVersion><MultipleInstances>Multiple</MultipleInstances>
+		<Mandatory>Optional</Mandatory>
+		<Resources>
+			<Item ID="0"><Name>Name</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains the name of a CmdhPolicy Object Instance ]]></Description>
+			</Item>
+			<Item ID="1"><Name>DefaultRule</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[1 reference to CmdhDefaults Object  Instance]]></Description>
+			</Item>
+			<Item ID="2"><Name>LimiRules</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[1 or more references to CmdhLimits Object Instances]]></Description>
+			</Item>
+			<Item ID="3"><Name>NetworkAccessECRules</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[1 or more references to CmdhNetworkAccessRules Object Instances]]></Description>
+			</Item>
+			<Item ID="4"><Name>BufferRules</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[1 or more references to CmdhBuffer Object Instances]]></Description>
+			</Item></Resources>
+		<Description2 />
+	</Object>
+</LWM2M>
\ No newline at end of file
diff --git a/leshan-server-demo/src/main/resources/models/Communication_Characteristics-V1_0.xml b/leshan-server-demo/src/main/resources/models/Communication_Characteristics-V1_0.xml
index 0bc7543094..b46edcadef 100644
--- a/leshan-server-demo/src/main/resources/models/Communication_Characteristics-V1_0.xml
+++ b/leshan-server-demo/src/main/resources/models/Communication_Characteristics-V1_0.xml
@@ -1,8 +1,69 @@
-<?xml version="1.0" encoding="utf-8"?><LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+FILE INFORMATION
+
+OMA Permanent Document
+   File: OMA-SUP-XML_LWM2M_APN_connection_profile-V1_0-20170314-A
+   Type: xml
+
+Public Reachable Information
+   Path: http://www.openmobilealliance.org/tech/profiles
+   Name: LWM2M_APN_connection_profile-v1_0.xml
+
+NORMATIVE INFORMATION
+
+  Information about this file can be found in the latest revision of
+
+    OMA-TS-LWM2M_ConnMgmt-V1_0
+
+  This is available at http://www.openmobilealliance.org/
+
+  Send comments to technical-comments@mail.openmobilealliance.org
+
+CHANGE HISTORY
+
+14032017 Status changed to Approved by TP, TP Ref # OMA-TP-2017-0019-INP_LWM2M_CONNMGMT-V1_0_RRP_for_Final_Approval
+	
+LEGAL DISCLAIMER
+
+  Copyright 2017 Open Mobile Alliance All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+  3. Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+  The above license is used as a license under copyright only.  Please
+  reference the OMA IPR Policy for patent licensing terms:
+  http://www.openmobilealliance.org/ipr.html
+-->
+
+<LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
 	<Object ObjectType="MODefinition">
 		<Name>Communication Characteristics</Name>
-		<Description1><![CDATA[This object enables configuration of various generic communications parameters.
-]]></Description1>
+		<Description1><![CDATA[This object enables configuration of various generic communications parameters.]]></Description1>
 		<ObjectID>17</ObjectID>
 		<ObjectURN>urn:oma:lwm2m:oma:17</ObjectURN>
 		<MultipleInstances>Single</MultipleInstances>
diff --git a/leshan-server-demo/src/main/resources/models/LWM2M_APN_connection_profile-V1_0.xml b/leshan-server-demo/src/main/resources/models/LWM2M_APN_connection_profile-v1_0.xml
similarity index 100%
rename from leshan-server-demo/src/main/resources/models/LWM2M_APN_connection_profile-V1_0.xml
rename to leshan-server-demo/src/main/resources/models/LWM2M_APN_connection_profile-v1_0.xml
diff --git a/leshan-server-demo/src/main/resources/models/LWM2M_Bearer_selection-V1_0.xml b/leshan-server-demo/src/main/resources/models/LWM2M_Bearer_selection-v1_0.xml
similarity index 100%
rename from leshan-server-demo/src/main/resources/models/LWM2M_Bearer_selection-V1_0.xml
rename to leshan-server-demo/src/main/resources/models/LWM2M_Bearer_selection-v1_0.xml
diff --git a/leshan-server-demo/src/main/resources/models/LWM2M_Cellular_connectivity-V1_0.xml b/leshan-server-demo/src/main/resources/models/LWM2M_Cellular_connectivity-v1_0.xml
similarity index 100%
rename from leshan-server-demo/src/main/resources/models/LWM2M_Cellular_connectivity-V1_0.xml
rename to leshan-server-demo/src/main/resources/models/LWM2M_Cellular_connectivity-v1_0.xml
diff --git a/leshan-server-demo/src/main/resources/models/LWM2M_DevCapMgmt-v1_0.xml b/leshan-server-demo/src/main/resources/models/LWM2M_DevCapMgmt-v1_0.xml
new file mode 100644
index 0000000000..c499d3d691
--- /dev/null
+++ b/leshan-server-demo/src/main/resources/models/LWM2M_DevCapMgmt-v1_0.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+FILE INFORMATION
+
+OMA Permanent Document
+   File: OMA-SUP-XML_LWM2M_DevCapMgmt-V1_0-20170308-A
+   Type: xml
+
+Public Reachable Information
+   Path: http://www.openmobilealliance.org/tech/profiles
+   Name: LWM2M_DevCapMgmt-v1_0.xml
+
+NORMATIVE INFORMATION
+
+  Information about this file can be found in the latest revision of
+
+    OMA-TS-LWM2M_DevCapMngt-V1_0
+
+  This is available at http://www.openmobilealliance.org/
+
+  Send comments to technical-comments@mail.openmobilealliance.org
+
+CHANGE HISTORY
+
+08032017 Status changed to Approved by TP, TP Ref # OMA-TP-2017-0021R01-INP_LWM2M_DevCapMgmt_1.0.2_for_Final_Approval_Notification
+	
+LEGAL DISCLAIMER
+
+  Copyright 2017 Open Mobile Alliance All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+  3. Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+  The above license is used as a license under copyright only.  Please
+  reference the OMA IPR Policy for patent licensing terms:
+  http://www.openmobilealliance.org/ipr.html
+-->
+
+<LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>DevCapMgmt</Name>
+		<Description1><![CDATA[This LWM2M Object is dedicated to manage the device capabilities of a device e.g. sensors, communication, etc.]]></Description1>
+		<ObjectID>15</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:oma:15</ObjectURN>
+		<MultipleInstances>Multiple</MultipleInstances>
+		<Mandatory>Optional</Mandatory>
+		<Resources>
+			<Item ID="0"><Name>Property</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[List of Device Capabilities inside a given Group.
+The format is a free list ASCII-represented integers separated by a semi colon. (e.g. 0;1;10)
+The list of capabilities per Group is given in Appendix B: Device Capabilities Vocabulary
+executable Resource can work with.
+]]></Description>
+			</Item>
+			<Item ID="1"><Name>Group</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0-15</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Group name of Device Capabilities
+0: SENSOR: luminosity, presence,temp,humidity
+1: CONTROL: Light, Power, Sound
+2: CONNECTIVITY: Bluetooth, wifi, …
+3: NAVIGATION: gps, galieo
+4: STORAGE: external memory,
+5: VISION: cam, video-cam, night_cam.
+6: SOUND: speaker, buzzer
+7: ANALOG_INPUT: generic input
+8: ANALOG_OUTPUT: generic output
+9-15: reserved
+
+]]></Description>
+			</Item>
+			<Item ID="2"><Name>Description</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Device Capability Description
+(manufacturer specified string)
+]]></Description>
+			</Item>
+			<Item ID="3"><Name>Attached</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Boolean</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[When the resource doesn’t exist, it means the associated Device Capability is not removable.
+When this resource is “False”, it means the associated Device Capability is removable and is currently not attached to the device.
+When this resource is “True”, it means the associated Device Capability – if removable – is currently attached to the Device.
+When a Device Capability is not removable, and the “Attached” Resource is present, the “Attached” value but be set to “True”.
+]]></Description>
+			</Item>
+			<Item ID="4"><Name>Enabled</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Boolean</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This resource indicates whether the Device Capability is enabled regardless whether the Device Capability is attached or not. If the value of this resource is “True” the Device Capability is in Enabled State. If the value is “False” the Device Capability is in Disabled State;
+The ‘Attached’ and ‘Enabled’ resources are independent. A Device Capability MAY have ‘True’ as value for ‘Enabled’ Resource while having ‘False’ as value for the ‘Attached’ Resource. That means the Device Capability is still not available and can’t be used until it is attached to the Device, but will be useable once the Device Capability is attached.
+]]></Description>
+			</Item>
+			<Item ID="5"><Name>opEnable</Name>
+				<Operations>E</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This command is used to enable the Device Capability to transfer the Device Capability from Disabled State to Enabled state.
+In Enabled State, the Device Capability is allowed to work when it is attached to the Device.
+]]></Description>
+			</Item>
+			<Item ID="6"><Name>opDisable</Name>
+				<Operations>E</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This command is used to disable the Device Capability to transfer the Device Capability from Enabled State to Disabled State.
+In Disabled state the Device Capability is not allowed to work.
+]]></Description>
+			</Item>
+			<Item ID="7"><Name>NotifyEn</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Boolean</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[When the Resources “Enabled” or “Attached” are under “Observation”, this resource specifies whether the LWM2M Server MUST be notified when the value of the Resource on “Observation” changed. If the Resource “NotifyEn” is not present or the value is ‘False’, the LWM2M Server will be not notified about this change. If the “NotifyEn” Resource is present and the value is ‘True’, the LWM2M Server will be notified.]]></Description>
+			</Item></Resources>
+		<Description2 />
+	</Object>
+</LWM2M>
\ No newline at end of file
diff --git a/leshan-server-demo/src/main/resources/models/LWM2M_Software_Component-v1_0.xml b/leshan-server-demo/src/main/resources/models/LWM2M_Software_Component-v1_0.xml
new file mode 100644
index 0000000000..f88f9c0009
--- /dev/null
+++ b/leshan-server-demo/src/main/resources/models/LWM2M_Software_Component-v1_0.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+FILE INFORMATION
+
+OMA Permanent Document
+   File: OMA-SUP-XML_LWM2M_Software_Component-V1_0-20170314-C
+   Type: xml
+
+Public Reachable Information
+   Path: http://www.openmobilealliance.org/tech/profiles
+   Name: LWM2M_Software_Component-v1_0.xml
+
+NORMATIVE INFORMATION
+
+  Information about this file can be found in the latest revision of
+
+    OMA-TS-LightweightM2M-V1_0
+
+  This is available at http://www.openmobilealliance.org/
+
+  Send comments to technical-comments@mail.openmobilealliance.org
+
+CHANGE HISTORY
+
+07022017 File created, see OMA-DM-LightweightM2M-2017-0046-CR_xml_files
+14032017 Status changed to Candidate by TP, TP Ref # OMA-TP-2017-0020-INP_LWM2M_SWMGMT-V1_0_RRP_for_Candidate_Re-Approval
+
+LEGAL DISCLAIMER
+
+  Copyright 2017 Open Mobile Alliance All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+  3. Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+  The above license is used as a license under copyright only.  Please
+  reference the OMA IPR Policy for patent licensing terms:
+  http://www.openmobilealliance.org/ipr.html
+-->
+
+<LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>LWM2M Software Component</Name>
+		<Description1><![CDATA[If some Objects are not supported after software update, the LwM2M Client MUST delete all the Object Instances of the Objects that are not supported.]]></Description1>
+		<ObjectID>14</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:oma:14</ObjectURN>
+		<MultipleInstances>Multiple</MultipleInstances>
+		<Mandatory>Optional</Mandatory>
+		<Resources>
+			<Item ID="0">
+				<Name>Component Identity</Name>
+        <Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0-255 bytes</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Name or identifier of the software component]]></Description>
+			</Item>
+			<Item ID="1">
+				<Name>Component Pack</Name>
+        <Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Opaque</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Software components is stored in this resource]]></Description>
+			</Item>
+			<Item ID="2">
+				<Name>Component Version</Name>
+        <Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0-255 bytes</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Version of the software component.]]></Description>
+			</Item>
+			<Item ID="3">
+				<Name>Activate</Name>
+        <Operations>E</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This action activates the software previously successfully installed (the SW Update Package Installation State Machine is currently in the INSTALLED state).]]></Description>
+			</Item>
+		
+			<Item ID="4"><Name>Deactivate</Name>
+				<Operations>E</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This action deactivates software if the SW Update Package Installation State Machine is currently in the INSTALLED state.]]></Description>
+			</Item>
+			<Item ID="5"><Name>Activation State</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Boolean</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Indicates the current activation state of this software component:
+0: DISABLED
+Activation State is DISABLED if the Software Component Activation State Machine is in the INACTIVE state or not alive.
+1: ENABLED
+Activation State is ENABLED only if the Software Component Activation State Machine is in the ACTIVE state.
+]]></Description>
+			</Item>
+			</Resources>
+		<Description2><![CDATA[]]></Description2>
+	</Object>
+</LWM2M>
diff --git a/leshan-server-demo/src/main/resources/models/LWM2M_Software_Management-v1_0.xml b/leshan-server-demo/src/main/resources/models/LWM2M_Software_Management-v1_0.xml
new file mode 100644
index 0000000000..a95426ebea
--- /dev/null
+++ b/leshan-server-demo/src/main/resources/models/LWM2M_Software_Management-v1_0.xml
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+FILE INFORMATION
+
+OMA Permanent Document
+   File: OMA-SUP-XML_LWM2M_Software_Management-V1_0-20170314-C
+   Type: xml
+
+Public Reachable Information
+   Path: http://www.openmobilealliance.org/tech/profiles
+   Name: LWM2M_Software_Management-v1_0.xml
+
+NORMATIVE INFORMATION
+
+  Information about this file can be found in the latest revision of
+
+    OMA-TS-LightweightM2M-V1_0
+
+  This is available at http://www.openmobilealliance.org/
+
+  Send comments to technical-comments@mail.openmobilealliance.org
+
+CHANGE HISTORY
+
+07022017 File created, see OMA-DM-LightweightM2M-2017-0046-CR_xml_files
+14032017 Status changed to Candidate by TP, TP Ref # OMA-TP-2017-0020-INP_LWM2M_SWMGMT-V1_0_RRP_for_Candidate_Re-Approval
+
+LEGAL DISCLAIMER
+
+  Copyright 2017 Open Mobile Alliance All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+  3. Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+  The above license is used as a license under copyright only.  Please
+  reference the OMA IPR Policy for patent licensing terms:
+  http://www.openmobilealliance.org/ipr.html
+-->
+
+<LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>LWM2M Software Management</Name>
+		<Description1><![CDATA[This LwM2M objects provides the resources needed to perform software management on the device. Each software component is managed via a dedicated Software Management Object instance.]]></Description1>
+		<ObjectID>9</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:oma:9</ObjectURN>
+		<MultipleInstances>Multiple</MultipleInstances>
+		<Mandatory>Optional</Mandatory>
+		<Resources>
+			<Item ID="0">
+				<Name>PkgName</Name>
+        <Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0-255 bytes</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Name of the software package]]></Description>
+			</Item>
+			<Item ID="1">
+				<Name>PkgVersion</Name>
+        <Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0-255 bytes</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Version of the software package]]></Description>
+			</Item>
+			<Item ID="2">
+				<Name>Package</Name>
+        <Operations>W</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Opaque</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Software package
+The package can be in one single software component, or any delivery material used by the Device to determine the software component(s) and proceed to their installation.
+Can be archive file, executable, manifest. This resource to be used when it is single block of delivery.
+]]></Description>
+			</Item>
+			<Item ID="3">
+				<Name>Package URI</Name>
+        <Operations>W</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0-255 bytes</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[URI from where the device can download the software package by an alternative mechanism. As soon the device has received the Package URI it performs the download at the next practical opportunity.
+Can be direct link to a single software component or link to archive file, executable, or manifest, used by the Device to determine, then access to the software component(s). This resource to be used when it is single block of delivery.
+]]></Description>
+			</Item>
+		
+			<Item ID="4"><Name>Install</Name>
+				<Operations>E</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Installs software from the package either stored in Package resource, or, downloaded from the Package URI. This Resource is only executable when the value of the State Resource is DELIVERED.]]></Description>
+			</Item>
+			<Item ID="5"><Name>Checkpoint</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Link to a Checkpoint“ object which allows to specify conditions/dependencies for a software update. E.g. power connected, sufficient memory, target system.]]></Description>
+			</Item>
+			<Item ID="6"><Name>Uninstall</Name>
+				<Operations>E</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Uninstalls the software package.
+This executable resource may have one argument.
+If used with no argument or argument is 0, the Package is removed i from the Device. If the argument is 1 (“ForUpdate”), the Client MUST prepare itself for receiving a Package used to upgrade the Software already in place. Update State is set back to INITIAL state.
+]]></Description>
+			</Item>
+			<Item ID="7"><Name>Update State</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0-4</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Indicates current state with respect to this software update. This value is set by the LwM2M Client.
+0: INITIAL
+Before downloading.
+(see 5.1.2.1)
+1: DOWNLOAD STARTED
+The downloading process has started and is on-going.
+(see 5.1.2.2)
+2: DOWNLOADED
+The package has been completely downloaded 
+(see 5.1.2.3)
+3: DELIVERED
+In that state, the package has been correctly downloaded and is ready to be installed. 
+(see 5.1.2.4)
+If executing the Install Resource failed, the state remains at DELIVERED.
+If executing the Install Resource was successful, the state changes from DELIVERED to INSTALLED.
+After executing the UnInstall Resource, the state changes to INITIAL.
+4: INSTALLED
+In that state the software is correctly installed and can be activated or deactivated according to the Activation State Machine.
+(see 5.1.2.5)
+]]></Description>
+			</Item>
+			<Item ID="8"><Name>Update Supported Objects</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Boolean</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this value is true, the LwM2M Client MUST inform the registered LwM2M Servers of Objects and Object Instances parameter by sending an Update or Registration message after the software update operation at the next practical opportunity if supported Objects in the LwM2M Client have changed, in order for the LwM2M Servers to promptly manage newly installed Objects. 
+If false, Objects and Object Instances parameter MUST be reported at the next periodic Update message.
+The default value is false.
+]]></Description>
+			</Item>
+			<Item ID="9"><Name>Update Result</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0-200</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains the result of downloading or installing/uninstalling the software
+0: Initial value. Prior to download any new package in the Device, Update Result MUST be reset to this initial value. One side effect of executing the Uninstall resource is to reset Update Result to this initial value “0”.
+1: Downloading. The package downloading process is on-going.
+2: Software successfully installed.
+3: Successfully Downloaded and package integrity verified
+(( 4-49, for expansion, of other scenarios))
+50: Not enough storage for the new software package.
+51: Out of memory during downloading process.
+52: Connection lost during downloading process.
+53: Package integrity check failure.
+54: Unsupported package type.
+56: Invalid URI
+57: Device defined update error
+58: Software installation failure
+59: Uninstallation Failure during forUpdate(arg=0)
+60-200 : (for expansion, selection to be in blocks depending on new introduction of features)
+This Resource MAY be reported by sending Observe operation.
+]]></Description>
+			</Item>
+			<Item ID="10"><Name>Activate</Name>
+				<Operations>E</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This action activates the software previously successfully installed (the Package Installation State Machine is currently in the INSTALLED state)]]></Description>
+			</Item>
+			<Item ID="11"><Name>Deactivate</Name>
+				<Operations>E</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This action deactivates softwareif the Package Installation State Machine is currently in the INSTALLED state.]]></Description>
+			</Item>
+			<Item ID="12"><Name>Activation State</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Boolean</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Indicates the current activation state of this software:
+0: DISABLED
+Activation State is DISABLED if the Software Activation State Machine is in the INACTIVE state or not alive.
+1: ENABLED
+Activation State is ENABLED only if the Software Activation State Machine is in the ACTIVE state
+]]></Description>
+			</Item>
+			<Item ID="13"><Name>Package Settings</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Link to “Package Settings” object which allows to modify at any time software configuration settings. This is an application specific object. 
+Note: OMA might provide a template for a Package Settings object in a future release of this specification.
+]]></Description>
+			</Item>
+			<Item ID="14"><Name>User Name</Name>
+				<Operations>W</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0-255 bytes</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[User Name for access to SW Update Package in pull mode.
+Key based mechanism can alternatively use for talking to the component server instead of user name and password combination.
+]]></Description>
+			</Item>
+			<Item ID="15"><Name>Password</Name>
+				<Operations>W</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0-255 bytes</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Password for access to SW Update Package in pull mode.]]></Description>
+			</Item></Resources>
+		<Description2><![CDATA[]]></Description2>
+	</Object>
+</LWM2M>
diff --git a/leshan-server-demo/src/main/resources/models/Non-Access_Stratum_NAS_configuration-V1_0.xml b/leshan-server-demo/src/main/resources/models/Non-Access_Stratum_NAS_configuration-V1_0.xml
index 9c95d66653..6a7f7ae273 100644
--- a/leshan-server-demo/src/main/resources/models/Non-Access_Stratum_NAS_configuration-V1_0.xml
+++ b/leshan-server-demo/src/main/resources/models/Non-Access_Stratum_NAS_configuration-V1_0.xml
@@ -1,9 +1,71 @@
-<?xml version="1.0" encoding="utf-8"?><LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+FILE INFORMATION
+
+OMA Permanent Document
+   File: OMA-SUP-XML_LWM2M_APN_connection_profile-V1_0-20170314-A
+   Type: xml
+
+Public Reachable Information
+   Path: http://www.openmobilealliance.org/tech/profiles
+   Name: LWM2M_APN_connection_profile-v1_0.xml
+
+NORMATIVE INFORMATION
+
+  Information about this file can be found in the latest revision of
+
+    OMA-TS-LWM2M_ConnMgmt-V1_0
+
+  This is available at http://www.openmobilealliance.org/
+
+  Send comments to technical-comments@mail.openmobilealliance.org
+
+CHANGE HISTORY
+
+14032017 Status changed to Approved by TP, TP Ref # OMA-TP-2017-0019-INP_LWM2M_CONNMGMT-V1_0_RRP_for_Final_Approval
+	
+LEGAL DISCLAIMER
+
+  Copyright 2017 Open Mobile Alliance All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+  3. Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+  The above license is used as a license under copyright only.  Please
+  reference the OMA IPR Policy for patent licensing terms:
+  http://www.openmobilealliance.org/ipr.html
+-->
+
+<LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
 	<Object ObjectType="MODefinition">
 		<Name>Non-Access Stratum (NAS) configuration </Name>
 		<Description1><![CDATA[This object provides Non-Access Stratum (NAS) configuration and is derived from 3GPP TS 24.368.]]></Description1>
 		<ObjectID>18</ObjectID>
-		<ObjectURN></ObjectURN>
+		<ObjectURN>urn:oma:lwm2m:oma:18</ObjectURN>
 		<MultipleInstances>Single</MultipleInstances>
 		<Mandatory>Optional</Mandatory>
 		<Resources>