diff --git a/data_model/clusters/ConcentrationMeasurement.xml b/data_model/clusters/ConcentrationMeasurement.xml
index c5e2971406f676..4b51cffa124321 100644
--- a/data_model/clusters/ConcentrationMeasurement.xml
+++ b/data_model/clusters/ConcentrationMeasurement.xml
@@ -261,4 +261,4 @@ Davis, CA 95616, USA
       </mandatoryConform>
     </attribute>
   </attributes>
-</cluster>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/DemandResponseLoadControl.xml b/data_model/clusters/DemandResponseLoadControl.xml
index 170cde68e8acff..a5322bfb4f7206 100644
--- a/data_model/clusters/DemandResponseLoadControl.xml
+++ b/data_model/clusters/DemandResponseLoadControl.xml
@@ -248,17 +248,14 @@ Davis, CA 95616, USA
     </struct>
     <struct name="LoadControlProgramStruct">
       <field id="0" name="ProgramID" type="octstr" default="0">
-        <access read="true" write="true"/>
         <mandatoryConform/>
         <constraint type="maxLength" value="16"/>
       </field>
       <field id="1" name="Name" type="string">
-        <access read="true" write="true"/>
         <mandatoryConform/>
         <constraint type="maxLength" value="32"/>
       </field>
       <field id="2" name="EnrollmentGroup" type="uint8" default="null">
-        <access read="true" write="true"/>
         <quality nullable="true"/>
         <mandatoryConform>
           <feature name="ENRLG"/>
@@ -266,13 +263,11 @@ Davis, CA 95616, USA
         <constraint type="between" from="0x01" to="0xFF"/>
       </field>
       <field id="3" name="RandomStartMinutes" type="uint8" default="null">
-        <access read="true" write="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
         <constraint type="between" from="0x00" to="0x3C"/>
       </field>
       <field id="4" name="RandomDurationMinutes" type="uint8" default="null">
-        <access read="true" write="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
         <constraint type="between" from="0x00" to="0x3C"/>
@@ -286,7 +281,6 @@ Davis, CA 95616, USA
     </struct>
     <struct name="TemperatureControlStruct">
       <field id="0" name="CoolingTempOffset" type="ref_TempDiff" default="null">
-        <access read="true" write="true"/>
         <quality nullable="true"/>
         <mandatoryConform>
           <feature name="TEMPO"/>
@@ -294,7 +288,6 @@ Davis, CA 95616, USA
         <constraint type="between" from="0x00" to="0x0FE"/>
       </field>
       <field id="1" name="HeatingTempOffset" type="ref_TempDiff" default="null">
-        <access read="true" write="true"/>
         <quality nullable="true"/>
         <mandatoryConform>
           <feature name="TEMPO"/>
@@ -302,7 +295,6 @@ Davis, CA 95616, USA
         <constraint type="between" from="0x00" to="0x0FE"/>
       </field>
       <field id="2" name="CoolingTempSetpoint" type="temperature" default="null">
-        <access read="true" write="true"/>
         <quality nullable="true"/>
         <mandatoryConform>
           <feature name="TEMPS"/>
@@ -310,7 +302,6 @@ Davis, CA 95616, USA
         <constraint type="between" from="0x954D" to="0x7FFF"/>
       </field>
       <field id="3" name="HeatingTempSetpoint" type="temperature" default="null">
-        <access read="true" write="true"/>
         <quality nullable="true"/>
         <mandatoryConform>
           <feature name="TEMPS"/>
diff --git a/data_model/clusters/DeviceEnergyManagement.xml b/data_model/clusters/DeviceEnergyManagement.xml
index 6d6477cc72fb7c..21f74a737d52cb 100644
--- a/data_model/clusters/DeviceEnergyManagement.xml
+++ b/data_model/clusters/DeviceEnergyManagement.xml
@@ -130,10 +130,10 @@ Davis, CA 95616, USA
   </features>
   <dataTypes>
     <enum name="AdjustmentCauseEnum">
-      <item value="0" name="Local" summary="The adjustment is to optimize the local energy usage">
+      <item value="0" name="LocalOptimization" summary="The adjustment is to optimize the local energy usage">
         <optionalConform/>
       </item>
-      <item value="1" name="Grid" summary="The adjustment is to optimize the grid energy usage">
+      <item value="1" name="GridOptimization" summary="The adjustment is to optimize the grid energy usage">
         <optionalConform/>
       </item>
     </enum>
@@ -237,13 +237,13 @@ Davis, CA 95616, USA
       </item>
     </enum>
     <enum name="ForecastUpdateReasonEnum">
-      <item value="0" name="Internal" summary="The update was due to internal ESA device optimization">
+      <item value="0" name="InternalOptimization" summary="The update was due to internal ESA device optimization">
         <optionalConform/>
       </item>
-      <item value="1" name="Local" summary="The update was due to local EMS optimization">
+      <item value="1" name="LocalOptimization" summary="The update was due to local EMS optimization">
         <optionalConform/>
       </item>
-      <item value="2" name="Grid" summary="The update was due to grid optimization">
+      <item value="2" name="GridOptimization" summary="The update was due to grid optimization">
         <optionalConform/>
       </item>
     </enum>
@@ -257,36 +257,31 @@ Davis, CA 95616, USA
       <item value="2" name="GridOptOut" summary="The user has opted out of grid EMS optimizations only">
         <mandatoryConform/>
       </item>
-      <item value="3" name="OptOut" summary="The user has opted out of all optimizations">
+      <item value="3" name="OptOut" summary="The user has opted out of all external optimizations">
         <mandatoryConform/>
       </item>
     </enum>
     <struct name="ConstraintsStruct">
       <field id="0" name="StartTime" type="epoch-s">
-        <access read="true" write="true"/>
         <mandatoryConform/>
         <constraint type="desc"/>
       </field>
       <field id="1" name="Duration" type="elapsed-s">
-        <access read="true" write="true"/>
         <mandatoryConform/>
         <constraint type="between" from="0" to="86400"/>
       </field>
       <field id="2" name="NominalPower" type="power-mW">
-        <access read="true" write="true"/>
         <mandatoryConform>
           <feature name="PFR"/>
         </mandatoryConform>
         <constraint type="desc"/>
       </field>
       <field id="3" name="MaximumEnergy" type="energy-mWh">
-        <access read="true" write="true"/>
         <mandatoryConform>
           <feature name="PFR"/>
         </mandatoryConform>
       </field>
       <field id="4" name="LoadControl" type="int8">
-        <access read="true" write="true"/>
         <mandatoryConform>
           <feature name="SFR"/>
         </mandatoryConform>
@@ -294,181 +289,146 @@ Davis, CA 95616, USA
     </struct>
     <struct name="CostStruct">
       <field id="0" name="CostType" type="CostTypeEnum" default="0">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="1" name="Value" type="int32" default="0">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="2" name="DecimalPoints" type="uint8" default="0">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="3" name="Currency" type="uint16" default="0">
-        <access read="true"/>
         <optionalConform/>
         <constraint type="max" value="999"/>
       </field>
     </struct>
     <struct name="ForecastStruct">
       <field id="0" name="ForecastId" type="uint16" default="0">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="1" name="ActiveSlotNumber" type="uint16" default="0">
-        <access read="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
       </field>
       <field id="2" name="StartTime" type="epoch-s">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="3" name="EndTime" type="epoch-s">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="4" name="EarliestStartTime" type="epoch-s">
-        <access read="true"/>
         <quality nullable="true"/>
         <mandatoryConform>
           <feature name="STA"/>
         </mandatoryConform>
       </field>
       <field id="5" name="LatestEndTime" type="epoch-s">
-        <access read="true"/>
         <mandatoryConform>
           <feature name="STA"/>
         </mandatoryConform>
       </field>
       <field id="6" name="IsPauseable" type="bool">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="7" name="Slots" type="list">
         <entry type="SlotStruct"/>
-        <access read="true"/>
         <mandatoryConform/>
         <constraint type="maxCount" value="10"/>
       </field>
       <field id="8" name="ForecastUpdateReason" type="ForecastUpdateReasonEnum">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
     </struct>
     <struct name="PowerAdjustStruct">
       <field id="0" name="MinPower" type="power-mW" default="0">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="1" name="MaxPower" type="power-mW" default="0">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="2" name="MinDuration" type="elapsed-s" default="0">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="3" name="MaxDuration" type="elapsed-s">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
     </struct>
     <struct name="SlotAdjustmentStruct">
       <field id="0" name="SlotIndex" type="uint8">
-        <access read="true" write="true"/>
         <mandatoryConform/>
         <constraint type="desc"/>
       </field>
       <field id="1" name="NominalPower" type="power-mW">
-        <access read="true" write="true"/>
         <mandatoryConform/>
         <constraint type="desc"/>
       </field>
       <field id="2" name="Duration" type="elapsed-s">
-        <access read="true" write="true"/>
         <mandatoryConform/>
         <constraint type="desc"/>
       </field>
     </struct>
     <struct name="SlotStruct">
       <field id="0" name="MinDuration" type="elapsed-s">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="1" name="MaxDuration" type="elapsed-s">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="2" name="DefaultDuration" type="elapsed-s">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="3" name="ElapsedSlotTime" type="elapsed-s">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="4" name="RemainingSlotTime" type="elapsed-s">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="5" name="SlotIsPauseable" type="bool">
-        <access read="true"/>
         <mandatoryConform>
           <feature name="PAU"/>
         </mandatoryConform>
       </field>
       <field id="6" name="MinPauseDuration" type="elapsed-s">
-        <access read="true"/>
         <mandatoryConform>
           <feature name="PAU"/>
         </mandatoryConform>
       </field>
       <field id="7" name="MaxPauseDuration" type="elapsed-s">
-        <access read="true"/>
         <mandatoryConform>
           <feature name="PAU"/>
         </mandatoryConform>
       </field>
       <field id="8" name="ManufacturerESAState" type="uint16">
-        <access read="true"/>
         <mandatoryConform>
           <feature name="SFR"/>
         </mandatoryConform>
       </field>
       <field id="9" name="NominalPower" type="power-mW">
-        <access read="true"/>
         <mandatoryConform>
           <feature name="PFR"/>
         </mandatoryConform>
       </field>
       <field id="10" name="MinPower" type="power-mW">
-        <access read="true"/>
         <mandatoryConform>
           <feature name="PFR"/>
         </mandatoryConform>
       </field>
       <field id="11" name="MaxPower" type="power-mW">
-        <access read="true"/>
         <mandatoryConform>
           <feature name="PFR"/>
         </mandatoryConform>
       </field>
       <field id="12" name="NominalEnergy" type="energy-mWh">
-        <access read="true"/>
         <mandatoryConform>
           <feature name="PFR"/>
         </mandatoryConform>
       </field>
       <field id="13" name="Costs" type="list">
         <entry type="CostStruct"/>
-        <access read="true"/>
         <optionalConform/>
         <constraint type="maxCount" value="5"/>
       </field>
       <field id="14" name="MinPowerAdjustment" type="power-mW">
-        <access read="true"/>
         <mandatoryConform>
           <andTerm>
             <feature name="FA"/>
@@ -477,7 +437,6 @@ Davis, CA 95616, USA
         </mandatoryConform>
       </field>
       <field id="15" name="MaxPowerAdjustment" type="power-mW">
-        <access read="true"/>
         <mandatoryConform>
           <andTerm>
             <feature name="FA"/>
@@ -486,7 +445,6 @@ Davis, CA 95616, USA
         </mandatoryConform>
       </field>
       <field id="16" name="MinDurationAdjustment" type="elapsed-s">
-        <access read="true"/>
         <mandatoryConform>
           <andTerm>
             <feature name="FA"/>
@@ -498,7 +456,6 @@ Davis, CA 95616, USA
         </mandatoryConform>
       </field>
       <field id="17" name="MaxDurationAdjustment" type="elapsed-s">
-        <access read="true"/>
         <mandatoryConform>
           <andTerm>
             <feature name="FA"/>
diff --git a/data_model/clusters/DiagnosticsGeneral.xml b/data_model/clusters/DiagnosticsGeneral.xml
index 3ea1b41fc62a75..072d75d64acc31 100644
--- a/data_model/clusters/DiagnosticsGeneral.xml
+++ b/data_model/clusters/DiagnosticsGeneral.xml
@@ -58,9 +58,14 @@ Davis, CA 95616, USA
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0033" name="General Diagnostics" revision="2">
   <revisionHistory>
     <revision revision="1" summary="Initial Release"/>
-    <revision revision="2" summary="UpTime attribute now mandatory, and added TimeSnapshot command"/>
+    <revision revision="2" summary="UpTime attribute now mandatory, and added TimeSnapshot command, added DMTEST feature."/>
   </revisionHistory>
   <classification hierarchy="base" role="utility" picsCode="DGGEN" scope="Node"/>
+  <features>
+    <feature bit="0" code="DMTEST" name="DataModelTest" summary="Support specific testing needs for extended Data Model features">
+      <optionalConform/>
+    </feature>
+  </features>
   <dataTypes>
     <enum name="BootReasonEnum">
       <item value="0" name="Unspecified" summary="The Node is unable to identify the Power-On reason as one of the other provided enumeration values.">
@@ -176,40 +181,32 @@ Davis, CA 95616, USA
     </enum>
     <struct name="NetworkInterface">
       <field id="0" name="Name" type="ref_DataTypeString">
-        <access read="true"/>
         <mandatoryConform/>
         <constraint type="max" value="32"/>
       </field>
       <field id="1" name="IsOperational" type="bool">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="2" name="OffPremiseServicesReachableIPv4" type="bool" default="null">
-        <access read="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
       </field>
       <field id="3" name="OffPremiseServicesReachableIPv6" type="bool" default="null">
-        <access read="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
       </field>
       <field id="4" name="HardwareAddress" type="Hardware Address">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="5" name="IPv4Addresses" type="ref_DataTypeList[ref_Ipv4Adr]">
-        <access read="true"/>
         <mandatoryConform/>
         <constraint type="max" value="4"/>
       </field>
       <field id="6" name="IPv6Addresses" type="ref_DataTypeList[ref_Ipv6Adr]">
-        <access read="true"/>
         <mandatoryConform/>
         <constraint type="max" value="8"/>
       </field>
       <field id="7" name="Type" type="InterfaceTypeEnum">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
     </struct>
@@ -289,6 +286,33 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </field>
     </command>
+    <command id="0x03" name="PayloadTestRequest" response="PayloadTestResponse">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="DMTEST"/>
+      </mandatoryConform>
+      <field id="0" name="EnableKey" type="octstr">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="16"/>
+      </field>
+      <field id="1" name="Value" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Count" type="uint16">
+        <mandatoryConform/>
+        <constraint type="max" value="2048"/>
+      </field>
+    </command>
+    <command id="0x04" name="PayloadTestResponse" direction="responseFromServer">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="DMTEST"/>
+      </mandatoryConform>
+      <field id="0" name="Payload" type="octstr">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="2048"/>
+      </field>
+    </command>
   </commands>
   <events>
     <event id="0x00" name="HardwareFaultChange" priority="critical">
diff --git a/data_model/clusters/ElectricalEnergyMeasurement.xml b/data_model/clusters/ElectricalEnergyMeasurement.xml
index bcf229c0266009..c6bf8e73863c41 100644
--- a/data_model/clusters/ElectricalEnergyMeasurement.xml
+++ b/data_model/clusters/ElectricalEnergyMeasurement.xml
@@ -67,50 +67,21 @@ Davis, CA 95616, USA
     <feature bit="1" code="EXPE" name="ExportedEnergy" summary="Measurement of energy provided by the server">
       <optionalConform choice="a" more="true"/>
     </feature>
-    <feature bit="2" code="CUME" name="CumulativeEnergy" summary="Measurements are accumulative">
-      <optionalConform choice="b" more="true">
-        <notTerm>
-          <feature name="EPHE"/>
-        </notTerm>
-      </optionalConform>
+    <feature bit="2" code="CUME" name="CumulativeEnergy" summary="Measurements are cumulative">
+      <optionalConform choice="b" more="true"/>
     </feature>
     <feature bit="3" code="PERE" name="PeriodicEnergy" summary="Measurements are periodic">
-      <optionalConform choice="b" more="true">
-        <notTerm>
-          <feature name="EPHE"/>
-        </notTerm>
-      </optionalConform>
-    </feature>
-    <feature bit="4" code="EPHE" name="EphemeralEnergy" summary="Measurements are ephemeral">
-      <mandatoryConform>
-        <andTerm>
-          <notTerm>
-            <feature name="CUME"/>
-          </notTerm>
-          <notTerm>
-            <feature name="PERE"/>
-          </notTerm>
-        </andTerm>
-      </mandatoryConform>
+      <optionalConform choice="b" more="true"/>
     </feature>
   </features>
+  <dataTypes/>
   <attributes>
-    <attribute id="0x0000" name="Measured" type="bool" default="false">
+    <attribute id="0x0000" name="Accuracy" type="ref_MeasurementAccuracyStruct">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
       <mandatoryConform/>
     </attribute>
-    <attribute id="0x0001" name="CumulativeEnergyImportedTime" type="epoch-s" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform>
-        <andTerm>
-          <feature name="IMPE"/>
-          <feature name="CUME"/>
-        </andTerm>
-      </mandatoryConform>
-    </attribute>
-    <attribute id="0x0002" name="CumulativeEnergyImported" type="uint64" default="null">
+    <attribute id="0x0001" name="CumulativeEnergyImported" type="EnergyMeasurementStruct" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
       <mandatoryConform>
@@ -120,17 +91,7 @@ Davis, CA 95616, USA
         </andTerm>
       </mandatoryConform>
     </attribute>
-    <attribute id="0x0003" name="CumulativeEnergyExportedTime" type="epoch-s" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform>
-        <andTerm>
-          <feature name="EXPE"/>
-          <feature name="CUME"/>
-        </andTerm>
-      </mandatoryConform>
-    </attribute>
-    <attribute id="0x0004" name="CumulativeEnergyExported" type="uint64" default="null">
+    <attribute id="0x0002" name="CumulativeEnergyExported" type="EnergyMeasurementStruct" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
       <mandatoryConform>
@@ -140,7 +101,7 @@ Davis, CA 95616, USA
         </andTerm>
       </mandatoryConform>
     </attribute>
-    <attribute id="0x0005" name="PeriodicEnergyImportedStartTime" type="epoch-s" default="null">
+    <attribute id="0x0003" name="PeriodicEnergyImported" type="EnergyMeasurementStruct" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
       <mandatoryConform>
@@ -150,47 +111,7 @@ Davis, CA 95616, USA
         </andTerm>
       </mandatoryConform>
     </attribute>
-    <attribute id="0x0006" name="PeriodicEnergyImportedEndTime" type="epoch-s" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform>
-        <andTerm>
-          <feature name="IMPE"/>
-          <feature name="PERE"/>
-        </andTerm>
-      </mandatoryConform>
-    </attribute>
-    <attribute id="0x0007" name="PeriodicEnergyImported" type="uint64" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform>
-        <andTerm>
-          <feature name="IMPE"/>
-          <feature name="PERE"/>
-        </andTerm>
-      </mandatoryConform>
-    </attribute>
-    <attribute id="0x0008" name="PeriodicEnergyExportedStartTime" type="epoch-s" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform>
-        <andTerm>
-          <feature name="EXPE"/>
-          <feature name="PERE"/>
-        </andTerm>
-      </mandatoryConform>
-    </attribute>
-    <attribute id="0x0009" name="PeriodicEnergyExportedEndTime" type="epoch-s" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform>
-        <andTerm>
-          <feature name="EXPE"/>
-          <feature name="PERE"/>
-        </andTerm>
-      </mandatoryConform>
-    </attribute>
-    <attribute id="0x000A" name="PeriodicEnergyExported" type="uint64" default="null">
+    <attribute id="0x0004" name="PeriodicEnergyExported" type="EnergyMeasurementStruct" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
       <mandatoryConform>
@@ -200,122 +121,57 @@ Davis, CA 95616, USA
         </andTerm>
       </mandatoryConform>
     </attribute>
-    <attribute id="0x000B" name="EphemeralEnergyImported" type="uint64" default="null">
+    <attribute id="0x0005" name="CumulativeEnergyReset" type="CumulativeEnergyResetStruct" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform>
-        <andTerm>
-          <feature name="IMPE"/>
-          <feature name="EPHE"/>
-        </andTerm>
-      </mandatoryConform>
-    </attribute>
-    <attribute id="0x000C" name="EphemeralEnergyExported" type="uint64" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform>
-        <andTerm>
-          <feature name="EXPE"/>
-          <feature name="EPHE"/>
-        </andTerm>
-      </mandatoryConform>
+      <optionalConform>
+        <feature name="CUME"/>
+      </optionalConform>
     </attribute>
   </attributes>
   <events>
-    <event id="0x00" name="CumulativeEnergyImported" priority="info">
-      <access readPrivilege="view"/>
-      <mandatoryConform>
-        <andTerm>
-          <feature name="CUME"/>
-          <feature name="IMPE"/>
-        </andTerm>
-      </mandatoryConform>
-      <field id="0" name="ImportedTimestamp" type="epoch-s">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="EnergyImported" type="uint64">
-        <mandatoryConform/>
-      </field>
-    </event>
-    <event id="0x01" name="CumulativeEnergyExported" priority="info">
+    <event id="0x00" name="CumulativeEnergyMeasured" priority="info">
       <access readPrivilege="view"/>
       <mandatoryConform>
-        <andTerm>
-          <feature name="CUME"/>
-          <feature name="EXPE"/>
-        </andTerm>
+        <feature name="CUME"/>
       </mandatoryConform>
-      <field id="0" name="ExportedTimestamp" type="epoch-s">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="EnergyExported" type="uint64">
-        <mandatoryConform/>
-      </field>
-    </event>
-    <event id="0x03" name="PeriodicEnergyImported" priority="info">
-      <access readPrivilege="view"/>
-      <mandatoryConform>
-        <andTerm>
-          <feature name="PERE"/>
-          <feature name="IMPE"/>
-        </andTerm>
-      </mandatoryConform>
-      <field id="0" name="PeriodStart" type="epoch-s">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="PeriodEnd" type="epoch-s">
-        <mandatoryConform/>
+      <field id="0" name="EnergyImported" type="EnergyMeasurementStruct">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="CUME"/>
+            <feature name="IMPE"/>
+          </andTerm>
+        </mandatoryConform>
       </field>
-      <field id="2" name="EnergyImported" type="uint64">
-        <mandatoryConform/>
+      <field id="1" name="EnergyExported" type="EnergyMeasurementStruct">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="CUME"/>
+            <feature name="EXPE"/>
+          </andTerm>
+        </mandatoryConform>
       </field>
     </event>
-    <event id="0x04" name="PeriodicEnergyExported" priority="info">
+    <event id="0x01" name="PeriodicEnergyMeasured" priority="info">
       <access readPrivilege="view"/>
       <mandatoryConform>
-        <andTerm>
-          <feature name="PERE"/>
-          <feature name="EXPE"/>
-        </andTerm>
+        <feature name="PERE"/>
       </mandatoryConform>
-      <field id="0" name="PeriodStart" type="epoch-s">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="PeriodEnd" type="epoch-s">
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="EnergyExported" type="uint64">
-        <mandatoryConform/>
-      </field>
-    </event>
-    <event id="0x05" name="EphemeralEnergyImported" priority="info">
-      <access readPrivilege="view"/>
-      <optionalConform>
-        <feature name="EPHE"/>
-      </optionalConform>
-      <field id="0" name="PeriodStart" type="systime-ms">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="PeriodEnd" type="systime-ms">
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="EnergyImported" type="uint64">
-        <mandatoryConform/>
-      </field>
-    </event>
-    <event id="0x06" name="EphemeralEnergyExported" priority="info">
-      <access readPrivilege="view"/>
-      <optionalConform>
-        <feature name="EPHE"/>
-      </optionalConform>
-      <field id="0" name="PeriodStart" type="systime-ms">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="PeriodEnd" type="systime-ms">
-        <mandatoryConform/>
+      <field id="0" name="EnergyImported" type="EnergyMeasurementStruct">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="PERE"/>
+            <feature name="IMPE"/>
+          </andTerm>
+        </mandatoryConform>
       </field>
-      <field id="2" name="EnergyExported" type="uint64">
-        <mandatoryConform/>
+      <field id="1" name="EnergyExported" type="EnergyMeasurementStruct">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="PERE"/>
+            <feature name="EXPE"/>
+          </andTerm>
+        </mandatoryConform>
       </field>
     </event>
   </events>
diff --git a/data_model/clusters/ElectricalPowerMeasurement.xml b/data_model/clusters/ElectricalPowerMeasurement.xml
index 996fb0ce59ec11..aa5baeaf368cbb 100644
--- a/data_model/clusters/ElectricalPowerMeasurement.xml
+++ b/data_model/clusters/ElectricalPowerMeasurement.xml
@@ -59,238 +59,151 @@ Davis, CA 95616, USA
   <revisionHistory>
     <revision revision="1" summary="Initial Release"/>
   </revisionHistory>
-  <classification hierarchy="base" role="application" picsCode="EMR" scope="Endpoint"/>
+  <classification hierarchy="base" role="application" picsCode="EPM" scope="Endpoint"/>
   <features>
-    <feature bit="0" code="DIRC" name="DirectCurrent" summary="Measurement of direct current">
+    <feature bit="0" code="DIRC" name="DirectCurrent" summary="Supports measurement of direct current">
       <optionalConform choice="a" more="true"/>
     </feature>
-    <feature bit="1" code="ALTC" name="AlternatingCurrent" summary="Measurement of alternating current">
+    <feature bit="1" code="ALTC" name="AlternatingCurrent" summary="Supports measurement of alternating current">
       <optionalConform choice="a" more="true"/>
     </feature>
-    <feature bit="2" code="THRP" name="ThreePhasePower" summary="Represents a three-phase connection">
+    <feature bit="2" code="POLY" name="PolyphasePower" summary="Supports polyphase measurements">
       <optionalConform>
         <feature name="ALTC"/>
       </optionalConform>
     </feature>
-    <feature bit="3" code="HARM" name="Harmonics" summary="Measurement of AC harmonics">
+    <feature bit="3" code="HARM" name="Harmonics" summary="Supports measurement of AC harmonics">
       <optionalConform>
         <feature name="ALTC"/>
       </optionalConform>
     </feature>
-    <feature bit="4" code="PWRQ" name="PowerQuality" summary="Measurement of AC harmonic phases">
+    <feature bit="4" code="PWRQ" name="PowerQuality" summary="Supports measurement of AC harmonic phases">
       <optionalConform>
         <feature name="ALTC"/>
       </optionalConform>
     </feature>
   </features>
   <dataTypes>
-    <enum name="MeasurementTypeEnum">
-      <item value="0" name="Unspecified">
-        <mandatoryConform/>
-      </item>
-      <item value="1" name="Voltage">
-        <mandatoryConform/>
-      </item>
-      <item value="2" name="Current">
+    <enum name="PowerModeEnum">
+      <item value="0" name="Unknown">
         <mandatoryConform/>
       </item>
-      <item value="3" name="ActivePower">
+      <item value="1" name="DC" summary="Direct current">
         <mandatoryConform/>
       </item>
-      <item value="4" name="RMSCurrent">
-        <mandatoryConform>
-          <feature name="ALTC"/>
-        </mandatoryConform>
-      </item>
-      <item value="5" name="RMSPower">
-        <mandatoryConform>
-          <feature name="ALTC"/>
-        </mandatoryConform>
-      </item>
-      <item value="6" name="ApparentPower">
-        <mandatoryConform>
-          <feature name="ALTC"/>
-        </mandatoryConform>
-      </item>
-      <item value="7" name="ReactivePower">
-        <mandatoryConform>
-          <feature name="ALTC"/>
-        </mandatoryConform>
-      </item>
-      <item value="8" name="Frequency">
-        <mandatoryConform>
-          <feature name="ALTC"/>
-        </mandatoryConform>
-      </item>
-      <item value="9" name="PowerFactor">
-        <mandatoryConform>
-          <feature name="ALTC"/>
-        </mandatoryConform>
-      </item>
-      <item value="10" name="LineCurrent">
-        <mandatoryConform>
-          <feature name="ALTC"/>
-        </mandatoryConform>
-      </item>
-      <item value="11" name="NeutralCurrent">
-        <mandatoryConform>
-          <feature name="THRP"/>
-        </mandatoryConform>
-      </item>
-    </enum>
-    <enum name="PowerModeEnum">
-      <item value="0" name="Unspecified">
+      <item value="2" name="AC" summary="Alternating current, either single-phase or polyphase">
         <mandatoryConform/>
       </item>
-      <item value="1" name="DC"/>
-      <item value="2" name="AC"/>
     </enum>
-    <struct name="HarmonicMeasurementStruct">
-      <field id="0" name="Order" type="uint8" default="1">
-        <access read="true"/>
-        <mandatoryConform/>
-        <constraint type="min" value="1"/>
-      </field>
-      <field id="1" name="Measurement" type="int32" default="null">
-        <access read="true"/>
-        <quality nullable="true"/>
-        <mandatoryConform/>
-      </field>
-    </struct>
-    <struct name="MeasurementAccuracyStruct">
-      <field id="0" name="MeasurementType" type="MeasurementTypeEnum">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="Measured" type="bool" default="false">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="PercentTypical" type="percent100ths" default="0">
-        <access read="true"/>
-        <quality nullable="true"/>
-        <optionalConform choice="a"/>
-      </field>
-      <field id="3" name="FixedTypical" type="int64" default="0">
-        <access read="true"/>
-        <quality nullable="true"/>
-        <optionalConform choice="a"/>
-        <constraint type="min" value="0"/>
-      </field>
-      <field id="4" name="PercentMin" type="percent100ths" default="0">
-        <access read="true"/>
-        <optionalConform/>
-      </field>
-      <field id="4" name="FixedMin" type="int64" default="0">
-        <access read="true"/>
-        <optionalConform/>
-        <constraint type="min" value="0"/>
-      </field>
-      <field id="5" name="PercentMax" type="percent100ths" default="0">
-        <access read="true"/>
-        <optionalConform/>
-      </field>
-      <field id="5" name="FixedMax" type="int64" default="0">
-        <access read="true"/>
-        <optionalConform/>
-        <constraint type="min" value="0"/>
-      </field>
-    </struct>
-    <struct name="MeasurementRangeStruct">
-      <field id="0" name="MeasurementType" type="MeasurementTypeEnum" default="0">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="Min" type="int64" default="null">
-        <access read="true"/>
-        <quality nullable="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="MinTimestamp" type="epoch-s" default="null">
-        <access read="true"/>
-        <quality nullable="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="3" name="Max" type="int64" default="null">
-        <access read="true"/>
-        <quality nullable="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="4" name="MaxTimestamp" type="epoch-s" default="null">
-        <access read="true"/>
-        <quality nullable="true"/>
-        <mandatoryConform/>
-      </field>
-    </struct>
   </dataTypes>
   <attributes>
     <attribute id="0x0000" name="PowerMode" type="PowerModeEnum">
       <access read="true" readPrivilege="view"/>
       <mandatoryConform/>
     </attribute>
-    <attribute id="0x0001" name="Accuracy" type="list">
-      <entry type="MeasurementAccuracyStruct"/>
+    <attribute id="0x0001" name="NumberOfMeasurementTypes" type="uint8">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
       <mandatoryConform/>
+      <constraint type="min" value="1"/>
     </attribute>
-    <attribute id="0x0002" name="Ranges" type="list">
-      <entry type="MeasurementRangeStruct"/>
+    <attribute id="0x0002" name="Accuracy" type="list">
+      <entry type="ref_MeasurementAccuracyStruct"/>
       <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
       <mandatoryConform/>
+      <constraint type="countBetween" from="1" to="NumberOfMeasurementTypes"/>
+    </attribute>
+    <attribute id="0x0003" name="Ranges" type="list" default="empty">
+      <entry type="MeasurementRangeStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+      <constraint type="countBetween" from="0" to="NumberOfMeasurementTypes"/>
     </attribute>
-    <attribute id="0x0003" name="Voltage" type="int64" default="null">
+    <attribute id="0x0004" name="Voltage" type="voltage-mV" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform/>
+      <optionalConform/>
+      <constraint type="between" from="-2" to="2"/>
     </attribute>
-    <attribute id="0x0004" name="Current" type="int64" default="null">
+    <attribute id="0x0005" name="ActiveCurrent" type="amperage-mA" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform/>
+      <optionalConform/>
+      <constraint type="between" from="-2" to="2"/>
+    </attribute>
+    <attribute id="0x0006" name="ReactiveCurrent" type="amperage-mA" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
+      <constraint type="between" from="-2" to="2"/>
+    </attribute>
+    <attribute id="0x0007" name="ApparentCurrent" type="amperage-mA" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
+      <constraint type="between" from="0" to="2"/>
     </attribute>
-    <attribute id="0x0005" name="ActivePower" type="int64" default="null">
+    <attribute id="0x0008" name="ActivePower" type="power-mW" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
       <mandatoryConform/>
+      <constraint type="between" from="-2" to="2"/>
     </attribute>
-    <attribute id="0x0006" name="RMSCurrent" type="int64" default="null">
+    <attribute id="0x0009" name="ReactivePower" type="power-mW" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform>
+      <optionalConform>
         <feature name="ALTC"/>
-      </mandatoryConform>
+      </optionalConform>
+      <constraint type="between" from="-2" to="2"/>
     </attribute>
-    <attribute id="0x0007" name="RMSPower" type="int64" default="null">
+    <attribute id="0x000A" name="ApparentPower" type="power-mW" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform>
+      <optionalConform>
         <feature name="ALTC"/>
-      </mandatoryConform>
+      </optionalConform>
+      <constraint type="between" from="-2" to="2"/>
     </attribute>
-    <attribute id="0x0008" name="ApparentPower" type="int64" default="null">
+    <attribute id="0x000B" name="RMSVoltage" type="voltage-mV" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform>
+      <optionalConform>
         <feature name="ALTC"/>
-      </mandatoryConform>
+      </optionalConform>
+      <constraint type="between" from="-2" to="2"/>
     </attribute>
-    <attribute id="0x0009" name="ReactivePower" type="int64" default="null">
+    <attribute id="0x000C" name="RMSCurrent" type="amperage-mA" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform>
+      <optionalConform>
         <feature name="ALTC"/>
-      </mandatoryConform>
+      </optionalConform>
+      <constraint type="between" from="-2" to="2"/>
     </attribute>
-    <attribute id="0x000A" name="Frequency" type="int64" default="null">
+    <attribute id="0x000D" name="RMSPower" type="power-mW" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform>
+      <optionalConform>
         <feature name="ALTC"/>
-      </mandatoryConform>
+      </optionalConform>
+      <constraint type="between" from="-2" to="2"/>
+    </attribute>
+    <attribute id="0x000E" name="Frequency" type="int64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
       <constraint type="between" from="0" to="1000000"/>
     </attribute>
-    <attribute id="0x000B" name="HarmonicCurrents" type="list" default="null">
+    <attribute id="0x000F" name="HarmonicCurrents" type="list" default="null">
       <entry type="HarmonicMeasurementStruct"/>
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
@@ -299,7 +212,7 @@ Davis, CA 95616, USA
       </mandatoryConform>
       <constraint type="desc"/>
     </attribute>
-    <attribute id="0x000C" name="HarmonicPhases" type="list" default="null">
+    <attribute id="0x0010" name="HarmonicPhases" type="list" default="null">
       <entry type="HarmonicMeasurementStruct"/>
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
@@ -308,51 +221,28 @@ Davis, CA 95616, USA
       </mandatoryConform>
       <constraint type="desc"/>
     </attribute>
-    <attribute id="0x000D" name="PowerFactor" type="int64" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <optionalConform/>
-      <constraint type="between" from="-10000" to="+10000"/>
-    </attribute>
-    <attribute id="0x000E" name="LineCurrent" type="int64" default="null">
+    <attribute id="0x0011" name="PowerFactor" type="int64" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform>
+      <optionalConform>
         <feature name="ALTC"/>
-      </mandatoryConform>
-      <constraint type="min" value="0"/>
+      </optionalConform>
+      <constraint type="between" from="-10000" to="10000"/>
     </attribute>
-    <attribute id="0x000F" name="NeutralCurrent" type="int64" default="null">
+    <attribute id="0x0012" name="NeutralCurrent" type="amperage-mA" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform>
-        <feature name="THRP"/>
-      </mandatoryConform>
+      <optionalConform>
+        <feature name="POLY"/>
+      </optionalConform>
+      <constraint type="between" from="-2" to="2"/>
     </attribute>
   </attributes>
   <events>
-    <event id="0x00" name="MeasurementPeriodRange" priority="info">
+    <event id="0x00" name="MeasurementPeriodRanges" priority="info">
       <access readPrivilege="view"/>
-      <mandatoryConform/>
-      <field id="0" name="MeasurementType" type="MeasurementTypeEnum">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="PeriodStart" type="epoch-s">
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="PeriodEnd" type="epoch-s">
-        <mandatoryConform/>
-      </field>
-      <field id="3" name="Min" type="int64">
-        <mandatoryConform/>
-      </field>
-      <field id="4" name="MinTimestamp" type="epoch-s">
-        <mandatoryConform/>
-      </field>
-      <field id="5" name="Max" type="int64">
-        <mandatoryConform/>
-      </field>
-      <field id="6" name="MaxTimestamp" type="epoch-s">
+      <field id="0" name="Ranges" type="list" default="R V">
+        <entry type="MeasurementRangeStruct"/>
         <mandatoryConform/>
       </field>
     </event>
diff --git a/data_model/clusters/EnergyCalendar.xml b/data_model/clusters/EnergyCalendar.xml
index 0f9cf3c087ecf8..a21845d92c47c4 100644
--- a/data_model/clusters/EnergyCalendar.xml
+++ b/data_model/clusters/EnergyCalendar.xml
@@ -195,9 +195,21 @@ Davis, CA 95616, USA
         <mandatoryConform/>
         <constraint type="between" from="0" to="1439"/>
       </field>
-      <field id="1" name="PriceTier" type="uint32"/>
-      <field id="2" name="FriendlyCredit" type="bool"/>
-      <field id="3" name="AuxiliaryLoad" type="AuxiliaryLoadBitmap"/>
+      <field id="1" name="PriceTier" type="uint32">
+        <optionalConform choice="a" more="true">
+          <feature name="PTIER"/>
+        </optionalConform>
+      </field>
+      <field id="2" name="FriendlyCredit" type="bool">
+        <optionalConform choice="a" more="true">
+          <feature name="FCRED"/>
+        </optionalConform>
+      </field>
+      <field id="3" name="AuxiliaryLoad" type="AuxiliaryLoadBitmap">
+        <optionalConform choice="a" more="true">
+          <feature name="AUXLD"/>
+        </optionalConform>
+      </field>
     </struct>
   </dataTypes>
   <attributes>
diff --git a/data_model/clusters/EnergyEVSE.xml b/data_model/clusters/EnergyEVSE.xml
index c788edc054ede0..f59d41807d43e6 100644
--- a/data_model/clusters/EnergyEVSE.xml
+++ b/data_model/clusters/EnergyEVSE.xml
@@ -227,12 +227,10 @@ Davis, CA 95616, USA
     </struct>
     <struct name="ChargingTargetStruct">
       <field id="0" name="TargetTimeMinutesPastMidnight" type="uint16" default="0">
-        <access read="true" write="true"/>
         <mandatoryConform/>
         <constraint type="between" from="0" to="1439"/>
       </field>
       <field id="1" name="TargetSoC" type="percent" default="0">
-        <access read="true" write="true"/>
         <otherwiseConform>
           <mandatoryConform>
             <feature name="SOC"/>
@@ -241,7 +239,6 @@ Davis, CA 95616, USA
         </otherwiseConform>
       </field>
       <field id="2" name="AddedEnergy" type="energy-mWh" default="0">
-        <access read="true" write="true"/>
         <optionalConform choice="a" more="true"/>
         <constraint type="min" value="0"/>
       </field>
@@ -277,19 +274,19 @@ Davis, CA 95616, USA
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
       <mandatoryConform/>
-      <constraint type="between" from="0" to="80000"/>
+      <constraint type="min" value="0"/>
     </attribute>
     <attribute id="0x0006" name="MinimumChargeCurrent" type="amperage-mA" default="6000">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
       <mandatoryConform/>
-      <constraint type="between" from="0" to="80000"/>
+      <constraint type="min" value="0"/>
     </attribute>
     <attribute id="0x0007" name="MaximumChargeCurrent" type="amperage-mA" default="0">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
       <mandatoryConform/>
-      <constraint type="between" from="0" to="80000"/>
+      <constraint type="min" value="0"/>
     </attribute>
     <attribute id="0x0008" name="MaximumDischargeCurrent" type="amperage-mA" default="0">
       <access read="true" readPrivilege="view"/>
@@ -297,7 +294,7 @@ Davis, CA 95616, USA
       <mandatoryConform>
         <feature name="V2X"/>
       </mandatoryConform>
-      <constraint type="between" from="0" to="80000"/>
+      <constraint type="min" value="0"/>
     </attribute>
     <attribute id="0x0009" name="UserMaximumChargeCurrent" type="amperage-mA" default="0">
       <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
@@ -421,11 +418,11 @@ Davis, CA 95616, USA
       </field>
       <field id="1" name="MinimumChargeCurrent" type="amperage-mA">
         <mandatoryConform/>
-        <constraint type="between" from="0" to="80000"/>
+        <constraint type="min" value="0"/>
       </field>
       <field id="2" name="MaximumChargeCurrent" type="amperage-mA">
         <mandatoryConform/>
-        <constraint type="between" from="0" to="80000"/>
+        <constraint type="min" value="0"/>
       </field>
     </command>
     <command id="0x03" name="EnableDischarging" response="Y">
@@ -439,7 +436,7 @@ Davis, CA 95616, USA
       </field>
       <field id="1" name="MaximumDischargeCurrent" type="amperage-mA">
         <mandatoryConform/>
-        <constraint type="between" from="0" to="80000"/>
+        <constraint type="min" value="0"/>
       </field>
     </command>
     <command id="0x04" name="StartDiagnostics" response="Y">
@@ -512,7 +509,7 @@ Davis, CA 95616, USA
       </field>
       <field id="2" name="MaximumCurrent" type="amperage-mA">
         <mandatoryConform/>
-        <constraint type="between" from="0" to="80000"/>
+        <constraint type="min" value="0"/>
       </field>
     </event>
     <event id="0x03" name="EnergyTransferStopped" priority="info">
diff --git a/data_model/clusters/EnergyPreference.xml b/data_model/clusters/EnergyPreference.xml
index fa50bbe839ae65..7156be8eafe025 100644
--- a/data_model/clusters/EnergyPreference.xml
+++ b/data_model/clusters/EnergyPreference.xml
@@ -85,11 +85,9 @@ Davis, CA 95616, USA
     </enum>
     <struct name="BalanceStruct">
       <field id="0" name="Step" type="percent" default="MS">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="1" name="Label" type="string">
-        <access read="true"/>
         <optionalConform/>
         <constraint type="maxLength" value="64"/>
       </field>
diff --git a/data_model/clusters/EnergyPrice.xml b/data_model/clusters/EnergyPrice.xml
index b358e75ab53a5c..23072a6a99ead5 100644
--- a/data_model/clusters/EnergyPrice.xml
+++ b/data_model/clusters/EnergyPrice.xml
@@ -113,15 +113,12 @@ Davis, CA 95616, USA
     </bitmap>
     <struct name="PriceComponentStruct">
       <field id="0" name="Price" type="int32">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="1" name="Source" type="PriceComponentSourceEnum" default="Tariff">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="2" name="Description" type="string">
-        <access read="true"/>
         <optionalConform/>
         <constraint type="maxLength" value="32 chars"/>
       </field>
@@ -129,35 +126,28 @@ Davis, CA 95616, USA
     </struct>
     <struct name="PriceStruct">
       <field id="0" name="PeriodStart" type="epoch-s">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="1" name="PeriodEnd" type="epoch-s" default="null">
-        <access read="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
       </field>
       <field id="2" name="Price" type="int32">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="3" name="DecimalPoints" type="uint8" default="0">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="4" name="Currency" type="uint16">
-        <access read="true"/>
         <mandatoryConform/>
         <constraint type="max" value="999"/>
       </field>
       <field id="5" name="Description" type="string">
-        <access read="true"/>
         <optionalConform/>
         <constraint type="maxLength" value="32"/>
       </field>
       <field id="6" name="Components" type="list" default="empty">
         <entry type="PriceComponentStruct"/>
-        <access read="true"/>
         <optionalConform/>
         <constraint type="maxCount" value="10"/>
       </field>
diff --git a/data_model/clusters/Group-Key-Management-Cluster.xml b/data_model/clusters/Group-Key-Management-Cluster.xml
index ad86b24e3bd387..43e7a395ac8467 100644
--- a/data_model/clusters/Group-Key-Management-Cluster.xml
+++ b/data_model/clusters/Group-Key-Management-Cluster.xml
@@ -87,16 +87,13 @@ Davis, CA 95616, USA
     </enum>
     <struct name="GroupInfoMapStruct">
       <field id="1" name="GroupId" type="ref_DataTypeGroupId">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="2" name="Endpoints" type="ref_DataTypeList[ref_DataTypeEndpointNumber]">
-        <access read="true"/>
         <mandatoryConform/>
         <constraint type="min" value="1"/>
       </field>
       <field id="3" name="GroupName" type="ref_DataTypeString">
-        <access read="true"/>
         <optionalConform/>
         <constraint type="max" value="16"/>
       </field>
diff --git a/data_model/clusters/ICDManagement.xml b/data_model/clusters/ICDManagement.xml
index f138e7037687b6..3cc6c9bfab4416 100644
--- a/data_model/clusters/ICDManagement.xml
+++ b/data_model/clusters/ICDManagement.xml
@@ -79,11 +79,11 @@ Davis, CA 95616, USA
     </enum>
     <struct name="MonitoringRegistrationStruct">
       <field id="1" name="CheckInNodeID" type="node-id">
-        <access read="true" readPrivilege="admin" fabricSensitive="true"/>
+        <access fabricSensitive="true"/>
         <mandatoryConform/>
       </field>
       <field id="2" name="MonitoredSubject" type="subject-id">
-        <access read="true" readPrivilege="admin" fabricSensitive="true"/>
+        <access fabricSensitive="true"/>
         <mandatoryConform/>
       </field>
       <field id="3" name="Key">
@@ -185,7 +185,7 @@ Davis, CA 95616, USA
         </mandatoryConform>
         <optionalConform/>
       </otherwiseConform>
-      <field id="0" name="StayActiveDuration" type="uint32" default="ActiveModeThreshold">
+      <field id="0" name="StayActiveDuration" type="uint32">
         <mandatoryConform/>
       </field>
     </command>
@@ -197,7 +197,7 @@ Davis, CA 95616, USA
         </mandatoryConform>
         <optionalConform/>
       </otherwiseConform>
-      <field id="0" name="PromisedActiveDuration" type="uint32" default="ActiveModeThreshold">
+      <field id="0" name="PromisedActiveDuration" type="uint32">
         <mandatoryConform/>
         <constraint type="desc"/>
       </field>
diff --git a/data_model/clusters/Messages.xml b/data_model/clusters/Messages.xml
index a976e7d260f0ff..9dd223d9a63f46 100644
--- a/data_model/clusters/Messages.xml
+++ b/data_model/clusters/Messages.xml
@@ -193,35 +193,35 @@ Davis, CA 95616, USA
     </struct>
     <struct name="MessageStruct">
       <field id="0" name="MessageID" type="MessageID">
-        <access read="true" fabricSensitive="true"/>
+        <access fabricSensitive="true"/>
         <mandatoryConform/>
       </field>
       <field id="1" name="Priority" type="MessagePriorityEnum" default="0">
-        <access read="true" fabricSensitive="true"/>
+        <access fabricSensitive="true"/>
         <mandatoryConform/>
       </field>
       <field id="2" name="MessageControl" type="MessageControlBitmap" default="0">
-        <access read="true" fabricSensitive="true"/>
+        <access fabricSensitive="true"/>
         <mandatoryConform/>
       </field>
       <field id="3" name="StartTime" type="epoch-s" default="0">
-        <access read="true" fabricSensitive="true"/>
+        <access fabricSensitive="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
       </field>
       <field id="4" name="Duration" type="uint16" default="0">
-        <access read="true" fabricSensitive="true"/>
+        <access fabricSensitive="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
       </field>
       <field id="5" name="MessageText" type="string">
-        <access read="true" fabricSensitive="true"/>
+        <access fabricSensitive="true"/>
         <mandatoryConform/>
         <constraint type="maxLength" value="256"/>
       </field>
       <field id="6" name="Responses" type="list" default="empty">
         <entry type="MessageResponseOptionStruct"/>
-        <access read="true" fabricSensitive="true"/>
+        <access fabricSensitive="true"/>
         <mandatoryConform>
           <feature name="RESP"/>
         </mandatoryConform>
@@ -248,10 +248,32 @@ Davis, CA 95616, USA
     <command id="0x00" name="PresentMessagesRequest" response="Y">
       <access invokePrivilege="operate" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="0" name="Messages" type="list">
-        <entry type="MessageStruct"/>
+      <field id="0" name="MessageID" type="MessageID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Priority" type="MessagePriorityEnum" default="0">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MessageControl" type="MessageControlBitmap" default="0">
         <mandatoryConform/>
       </field>
+      <field id="3" name="StartTime" type="epoch-s" default="0">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="Duration" type="uint16" default="0">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="MessageText" type="string">
+        <mandatoryConform/>
+      </field>
+      <field id="6" name="Responses" type="list" default="empty">
+        <entry type="MessageResponseOptionStruct"/>
+        <mandatoryConform>
+          <feature name="RESP"/>
+        </mandatoryConform>
+      </field>
     </command>
     <command id="0x01" name="CancelMessagesRequest" response="Y">
       <access invokePrivilege="operate" fabricScoped="true"/>
@@ -262,4 +284,44 @@ Davis, CA 95616, USA
       </field>
     </command>
   </commands>
+  <events>
+    <event id="0x00" name="MessageQueued" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="MessageID" type="MessageID">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="MessagePresented" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="MessageID" type="MessageID">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x02" name="MessageComplete" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="MessageID" type="MessageID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ResponseID" type="uint32" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="RESP"/>
+        </mandatoryConform>
+      </field>
+      <field id="2" name="Reply" type="string" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="RPLY"/>
+        </mandatoryConform>
+        <constraint type="maxLength" value="256"/>
+      </field>
+      <field id="3" name="FutureMessagesPreference" type="FutureMessagePreferenceEnum" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
 </cluster>
\ No newline at end of file
diff --git a/data_model/clusters/ModeBase.xml b/data_model/clusters/ModeBase.xml
index 1e6a81807e29a2..5774a7fec0c5a5 100644
--- a/data_model/clusters/ModeBase.xml
+++ b/data_model/clusters/ModeBase.xml
@@ -70,29 +70,24 @@ Require at least one standard mode tag. Define reserved ranges for base/derived
   <dataTypes>
     <struct name="ModeOptionStruct">
       <field id="0" name="Label" type="string" default="MS">
-        <access read="true"/>
         <mandatoryConform/>
         <constraint type="maxLength" value="64"/>
       </field>
       <field id="1" name="Mode" type="uint8" default="MS">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="2" name="ModeTags" type="list" default="MS">
         <entry type="ModeTagStruct"/>
-        <access read="true"/>
         <mandatoryConform/>
         <constraint type="maxCount" value="8"/>
       </field>
     </struct>
     <struct name="ModeTagStruct">
       <field id="0" name="MfgCode" type="vendor-id">
-        <access read="true"/>
         <optionalConform/>
         <constraint type="desc"/>
       </field>
       <field id="1" name="Value" type="enum16">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
     </struct>
diff --git a/data_model/clusters/ModeSelect.xml b/data_model/clusters/ModeSelect.xml
index 2fff860458f0e5..19fe502c1fcfe2 100644
--- a/data_model/clusters/ModeSelect.xml
+++ b/data_model/clusters/ModeSelect.xml
@@ -69,29 +69,24 @@ Davis, CA 95616, USA
   <dataTypes>
     <struct name="ModeOptionStruct">
       <field id="0" name="Label" type="string" default="MS">
-        <access read="true"/>
         <mandatoryConform/>
         <constraint type="maxLength" value="64"/>
       </field>
       <field id="1" name="Mode" type="uint8" default="MS">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="2" name="SemanticTags" type="list" default="MS">
         <entry type="SemanticTagStruct"/>
-        <access read="true"/>
         <mandatoryConform/>
         <constraint type="maxCount" value="64"/>
       </field>
     </struct>
     <struct name="SemanticTagStruct">
       <field id="0" name="MfgCode" type="vendor-id">
-        <access read="true"/>
         <mandatoryConform/>
         <constraint type="desc"/>
       </field>
       <field id="1" name="Value" type="enum16">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
     </struct>
diff --git a/data_model/clusters/Mode_DeviceEnergyManagement.xml b/data_model/clusters/Mode_DeviceEnergyManagement.xml
index dc28204cecb511..4181b9b60ead42 100644
--- a/data_model/clusters/Mode_DeviceEnergyManagement.xml
+++ b/data_model/clusters/Mode_DeviceEnergyManagement.xml
@@ -62,30 +62,10 @@ Davis, CA 95616, USA
   <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="DEMM" scope="Endpoint"/>
   <dataTypes>
     <struct name="ModeOptionStruct">
-      <field id="0" name="Label">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="Mode">
-        <mandatoryConform/>
-      </field>
       <field id="2" name="ModeTags">
         <mandatoryConform/>
         <constraint type="between" from="1" to="8"/>
       </field>
     </struct>
   </dataTypes>
-  <attributes>
-    <attribute id="0x0000" name="SupportedModes">
-      <mandatoryConform/>
-    </attribute>
-    <attribute id="0x0001" name="CurrentMode">
-      <mandatoryConform/>
-    </attribute>
-    <attribute id="0x0002" name="StartUpMode">
-      <provisionalConform/>
-    </attribute>
-    <attribute id="0x0003" name="OnMode">
-      <provisionalConform/>
-    </attribute>
-  </attributes>
 </cluster>
\ No newline at end of file
diff --git a/data_model/clusters/OccupancySensing.xml b/data_model/clusters/OccupancySensing.xml
index 1dd5cbe6156865..d52f118b70cbde 100644
--- a/data_model/clusters/OccupancySensing.xml
+++ b/data_model/clusters/OccupancySensing.xml
@@ -55,11 +55,12 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0406" name="Occupancy Sensing" revision="3">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0406" name="Occupancy Sensing" revision="4">
   <revisionHistory>
     <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
     <revision revision="2" summary="Physical Contact Occupancy feature with mandatory OccupancySensorTypeBitmap"/>
     <revision revision="3" summary="New data model format and notation"/>
+    <revision revision="4" summary="Remove nullable from PhysicalContact delay attributes and ability to not report transitions"/>
   </revisionHistory>
   <classification hierarchy="base" role="application" picsCode="OCC" scope="Endpoint"/>
   <dataTypes>
@@ -159,12 +160,10 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x0030" name="PhysicalContactOccupiedToUnoccupiedDelay" type="uint16" default="0">
       <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
       <optionalConform/>
     </attribute>
     <attribute id="0x0031" name="PhysicalContactUnoccupiedToOccupiedDelay" type="uint16" default="0">
       <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
       <optionalConform/>
     </attribute>
     <attribute id="0x0032" name="PhysicalContactUnoccupiedToOccupiedThreshold" type="uint8" default="1">
diff --git a/data_model/clusters/PowerSourceConfigurationCluster.xml b/data_model/clusters/PowerSourceConfigurationCluster.xml
index b2eb27fd4bd7cc..5548bf6ad8e6b5 100644
--- a/data_model/clusters/PowerSourceConfigurationCluster.xml
+++ b/data_model/clusters/PowerSourceConfigurationCluster.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
   <revisionHistory>
     <revision revision="1" summary="Initial Release"/>
   </revisionHistory>
-  <classification hierarchy="base" role="utility" picsCode="PSCFG" scope="Endpoint"/>
+  <classification hierarchy="base" role="utility" picsCode="PSCFG" scope="Node"/>
   <attributes>
     <attribute id="0x0000" name="Sources" type="list">
       <entry type="ref_DataTypeEndpointNumber"/>
diff --git a/data_model/clusters/PowerTopology.xml b/data_model/clusters/PowerTopology.xml
new file mode 100644
index 00000000000000..c8d90baeeded19
--- /dev/null
+++ b/data_model/clusters/PowerTopology.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x009C" name="Power Topology" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="PWRTL" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="NODE" name="NodeTopology" summary="This endpoint provides or consumes power to/from the entire node">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="1" code="TREE" name="TreeTopology" summary="This endpoint provides or consumes power to/from itself and its child endpoints">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="2" code="SET" name="SetTopology" summary="This endpoint provides or consumes power to/from a specified set of endpoints">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="3" code="DYPF" name="DynamicPowerFlow" summary="The specified set of endpoints may change">
+      <optionalConform>
+        <feature name="SET"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <attributes>
+    <attribute id="0x0000" name="AvailableEndpoints" type="list">
+      <entry type="endpoint-no"/>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="SET"/>
+      </mandatoryConform>
+      <constraint type="maxCount" value="20"/>
+    </attribute>
+    <attribute id="0x0001" name="ActiveEndpoints" type="list">
+      <entry type="endpoint-no"/>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="DYPF"/>
+      </mandatoryConform>
+      <constraint type="maxCount" value="20"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/ResourceMonitoring.xml b/data_model/clusters/ResourceMonitoring.xml
index 9772efbd429982..17fc7554ac41f0 100644
--- a/data_model/clusters/ResourceMonitoring.xml
+++ b/data_model/clusters/ResourceMonitoring.xml
@@ -116,12 +116,10 @@ Davis, CA 95616, USA
     </enum>
     <struct name="ReplacementProductStruct">
       <field id="0" name="ProductIdentifierType" type="ProductIdentifierTypeEnum">
-        <access read="true"/>
         <mandatoryConform/>
         <constraint type="desc"/>
       </field>
       <field id="1" name="ProductIdentifierValue" type="string">
-        <access read="true"/>
         <mandatoryConform/>
         <constraint type="maxLength" value="20"/>
       </field>
@@ -171,4 +169,4 @@ Davis, CA 95616, USA
       <optionalConform/>
     </command>
   </commands>
-</cluster>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Scenes.xml b/data_model/clusters/Scenes.xml
index 2168c164a02460..0c4347c4e8be8a 100644
--- a/data_model/clusters/Scenes.xml
+++ b/data_model/clusters/Scenes.xml
@@ -1,59 +1,59 @@
 <?xml version="1.0"?>
-<!--
-Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
-The information within this document is the property of the Connectivity
-Standards Alliance and its use and disclosure are restricted, except as
-expressly set forth herein.
-
-Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
-nontransferable, worldwide, limited and revocable license (without the right to
-sublicense), under Connectivity Standards Alliance's applicable copyright
-rights, to view, download, save, reproduce and use the document solely for your
-own internal purposes and in accordance with the terms of the license set forth
-herein. This license does not authorize you to, and you expressly warrant that
-you shall not: (a) permit others (outside your organization) to use this
-document; (b) post or publish this document; (c) modify, adapt, translate, or
-otherwise change this document in any manner or create any derivative work
-based on this document; (d) remove or modify any notice or label on this
-document, including this Copyright Notice, License and Disclaimer. The
-Connectivity Standards Alliance does not grant you any license hereunder other
-than as expressly stated herein.
-
-Elements of this document may be subject to third party intellectual property
-rights, including without limitation, patent, copyright or trademark rights,
-and any such third party may or may not be a member of the Connectivity
-Standards Alliance. Connectivity Standards Alliance members grant other
-Connectivity Standards Alliance members certain intellectual property rights as
-set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
-Standards Alliance members do not grant you any rights under this license. The
-Connectivity Standards Alliance is not responsible for, and shall not be held
-responsible in any manner for, identifying or failing to identify any or all
-such third party intellectual property rights. Please visit www.csa-iot.org for
-more information on how to become a member of the Connectivity Standards
-Alliance.
-
-This document and the information contained herein are provided on an “AS IS”
-basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
-INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
-WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
-OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
-CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
-BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
-DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
-DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
-OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-LOSS OR DAMAGE.
-
-All company, brand and product names in this document may be trademarks that
-are the sole property of their respective owners.
-
-This notice and disclaimer must be included on all copies of this document.
-
-Connectivity Standards Alliance
-508 Second Street, Suite 206
-Davis, CA 95616, USA
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0062" name="Scenes Management" revision="1">
   <revisionHistory>
@@ -73,50 +73,39 @@ Davis, CA 95616, USA
     </bitmap>
     <struct name="AttributeValuePairStruct">
       <field id="0" name="AttributeID" type="attribute-id">
-        <access read="true" write="true"/>
         <mandatoryConform/>
       </field>
       <field id="1" name="ValueUnsigned8" type="uint8">
-        <access read="true" write="true"/>
         <optionalConform choice="a"/>
       </field>
       <field id="2" name="ValueSigned8" type="int8">
-        <access read="true" write="true"/>
         <optionalConform choice="a"/>
       </field>
       <field id="3" name="ValueUnsigned16" type="uint16">
-        <access read="true" write="true"/>
         <optionalConform choice="a"/>
       </field>
       <field id="4" name="ValueSigned16" type="int16">
-        <access read="true" write="true"/>
         <optionalConform choice="a"/>
       </field>
       <field id="5" name="ValueUnsigned32" type="uint32">
-        <access read="true" write="true"/>
         <optionalConform choice="a"/>
       </field>
       <field id="6" name="ValueSigned32" type="int32">
-        <access read="true" write="true"/>
         <optionalConform choice="a"/>
       </field>
       <field id="7" name="ValueUnsigned64" type="uint64">
-        <access read="true" write="true"/>
         <optionalConform choice="a"/>
       </field>
       <field id="8" name="ValueSigned64" type="int64">
-        <access read="true" write="true"/>
         <optionalConform choice="a"/>
       </field>
     </struct>
     <struct name="ExtensionFieldSetStruct">
       <field id="0" name="ClusterID" type="cluster-id">
-        <access read="true" write="true"/>
         <mandatoryConform/>
       </field>
       <field id="1" name="AttributeValueList" type="list">
         <entry type="AttributeValuePairStruct"/>
-        <access read="true" write="true"/>
         <mandatoryConform/>
         <constraint type="desc"/>
       </field>
@@ -146,24 +135,22 @@ Davis, CA 95616, USA
     </struct>
     <struct name="SceneInfoStruct">
       <field id="0" name="SceneCount" type="uint8" default="0">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="1" name="CurrentScene" type="uint8" default="0xFF">
-        <access read="true" fabricSensitive="true"/>
+        <access fabricSensitive="true"/>
         <mandatoryConform/>
         <constraint type="desc"/>
       </field>
       <field id="2" name="CurrentGroup" type="group-id" default="0">
-        <access read="true" fabricSensitive="true"/>
+        <access fabricSensitive="true"/>
         <mandatoryConform/>
       </field>
       <field id="3" name="SceneValid" type="bool" default="False">
-        <access read="true" fabricSensitive="true"/>
+        <access fabricSensitive="true"/>
         <mandatoryConform/>
       </field>
       <field id="4" name="RemainingCapacity" type="uint8" default="MS">
-        <access read="true"/>
         <mandatoryConform/>
         <constraint type="max" value="253"/>
       </field>
diff --git a/data_model/clusters/Thermostat.xml b/data_model/clusters/Thermostat.xml
index b7e811bb8738ae..400d55a048a116 100644
--- a/data_model/clusters/Thermostat.xml
+++ b/data_model/clusters/Thermostat.xml
@@ -451,27 +451,16 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </bitfield>
     </bitmap>
-    <bitmap name="TemperatureSetpointHoldPolicy">
-      <bitfield name="HoldDurationElapsed" bit="0" summary="Hold will be cleared when the hold duration has elapsed">
-        <mandatoryConform/>
-      </bitfield>
-      <bitfield name="HoldDurationElapsedOrPresetChanged" bit="1" summary="Hold will be cleared when either the hold duration has elapsed or the preset changes">
-        <mandatoryConform/>
-      </bitfield>
-    </bitmap>
     <struct name="WeeklyScheduleTransitionStruct">
       <field id="0" name="TransitionTime" type="uint16">
-        <access read="true" write="true"/>
         <mandatoryConform/>
-        <constraint type="between" from="0" to="1439"/>
+        <constraint type="max" value="1439"/>
       </field>
       <field id="1" name="HeatSetpoint" type="temperature">
-        <access read="true" write="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
       </field>
       <field id="2" name="CoolSetpoint" type="temperature">
-        <access read="true" write="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
       </field>
@@ -701,7 +690,7 @@ Davis, CA 95616, USA
       <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
       <optionalConform/>
-      <constraint type="between" from="0" to="1440"/>
+      <constraint type="max" value="1440"/>
     </attribute>
     <attribute id="0x0025" name="ThermostatProgrammingOperationMode" type="ProgrammingOperationModeBitmap" default="0">
       <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
@@ -742,7 +731,7 @@ Davis, CA 95616, USA
       <mandatoryConform>
         <feature name="SB"/>
       </mandatoryConform>
-      <constraint type="between" from="0" to="OccupiedSetbackMax"/>
+      <constraint type="max" value="OccupiedSetbackMax"/>
     </attribute>
     <attribute id="0x0036" name="OccupiedSetbackMax" type="UnsignedTemperature" default="null">
       <access read="true" readPrivilege="view"/>
@@ -772,7 +761,7 @@ Davis, CA 95616, USA
           <feature name="OCC"/>
         </andTerm>
       </mandatoryConform>
-      <constraint type="between" from="0" to="UnoccupiedSetbackMax"/>
+      <constraint type="max" value="UnoccupiedSetbackMax"/>
     </attribute>
     <attribute id="0x0039" name="UnoccupiedSetbackMax" type="UnsignedTemperature" default="null">
       <access read="true" readPrivilege="view"/>
@@ -898,7 +887,7 @@ Davis, CA 95616, USA
       </mandatoryConform>
       <field id="0" name="TimeOfDay" type="uint16">
         <mandatoryConform/>
-        <constraint type="between" from="0" to="1439"/>
+        <constraint type="max" value="1439"/>
       </field>
       <field id="1" name="RelayStatus" type="RelayStateBitmap">
         <mandatoryConform/>
diff --git a/data_model/clusters/WaterContentMeasurement.xml b/data_model/clusters/WaterContentMeasurement.xml
index bca3f6de8e4101..8b1ff6a9a049bc 100644
--- a/data_model/clusters/WaterContentMeasurement.xml
+++ b/data_model/clusters/WaterContentMeasurement.xml
@@ -87,4 +87,4 @@ Davis, CA 95616, USA
       <constraint type="between" from="0" to="2048"/>
     </attribute>
   </attributes>
-</cluster>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/WiFiNetworkManagement.xml b/data_model/clusters/WiFiNetworkManagement.xml
new file mode 100644
index 00000000000000..6308eca7e4b184
--- /dev/null
+++ b/data_model/clusters/WiFiNetworkManagement.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Wi" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="TODO" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0001" name="SSID" type="octstr" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="lengthBetween" from="1" to="32"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="NetworkPassphraseRequest" response="NetworkPassphraseResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x01" name="NetworkPassphraseResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field name="Passphrase" type="octstr">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="64"/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/bridge-clusters-Actions.xml b/data_model/clusters/bridge-clusters-Actions.xml
index ccacb56e8b2576..51f7ee79bb4bad 100644
--- a/data_model/clusters/bridge-clusters-Actions.xml
+++ b/data_model/clusters/bridge-clusters-Actions.xml
@@ -157,28 +157,22 @@ Davis, CA 95616, USA
     </bitmap>
     <struct name="ActionStruct">
       <field id="0" name="ActionID" type="uint16">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="1" name="Name" type="ref_DataTypeString">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="2" name="Type" type="ActionTypeEnum">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="3" name="EndpointListID" type="uint16">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="4" name="SupportedCommands" type="CommandBits">
-        <access read="true"/>
         <mandatoryConform/>
         <constraint type="between" from="0" to="0x0FFF"/>
       </field>
       <field id="5" name="State" type="ActionStateEnum">
-        <access read="true"/>
         <mandatoryConform/>
       </field>
     </struct>
diff --git a/data_model/device_types/Aggregator.xml b/data_model/device_types/Aggregator.xml
index f9bff7aa27cd55..4e0eb1cee512c3 100644
--- a/data_model/device_types/Aggregator.xml
+++ b/data_model/device_types/Aggregator.xml
@@ -60,7 +60,7 @@ Davis, CA 95616, USA
     <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
     <revision revision="1" summary="Initial release of this document"/>
   </revisionHistory>
-  <classification class="dynamic utility" scope="endpoint"/>
+  <classification class="simple" scope="endpoint"/>
   <conditions/>
   <clusters>
     <cluster id="0x0003" name="Identify" side="server">
diff --git a/data_model/device_types/ColorTemperatureLight.xml b/data_model/device_types/ColorTemperatureLight.xml
index 210ce03b2da41c..5d6ac140803e23 100644
--- a/data_model/device_types/ColorTemperatureLight.xml
+++ b/data_model/device_types/ColorTemperatureLight.xml
@@ -60,7 +60,7 @@ Davis, CA 95616, USA
     <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <revision revision="2" summary="New data model format and notation"/>
-    <revision revision="3" summary="Added optional occupancy sensing and measurement clusters for energy and power"/>
+    <revision revision="3" summary="Added optional occupancy sensing"/>
   </revisionHistory>
   <classification superset="Dimmable Light" class="simple" scope="endpoint"/>
   <conditions/>
@@ -114,12 +114,6 @@ Davis, CA 95616, USA
         </command>
       </commands>
     </cluster>
-    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
-      <optionalConform/>
-    </cluster>
-    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
-      <optionalConform/>
-    </cluster>
     <cluster id="0x0300" name="Color Control" side="server">
       <mandatoryConform/>
       <features>
diff --git a/data_model/device_types/ContentApp.xml b/data_model/device_types/ContentApp.xml
index a6eb1a4ca0d424..0db03141e7f9a1 100644
--- a/data_model/device_types/ContentApp.xml
+++ b/data_model/device_types/ContentApp.xml
@@ -61,7 +61,6 @@ Davis, CA 95616, USA
     <revision revision="1" summary="Initial release of this document"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
-  <conditions/>
   <clusters>
     <cluster id="0x0504" name="Channel" side="server">
       <optionalConform/>
diff --git a/data_model/device_types/DimmableLight.xml b/data_model/device_types/DimmableLight.xml
index ce5dce7c8bf192..42c7d20fb4caad 100644
--- a/data_model/device_types/DimmableLight.xml
+++ b/data_model/device_types/DimmableLight.xml
@@ -55,12 +55,11 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0101" name="Dimmable Light" revision="3">
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0101" name="Dimmable Light" revision="2">
   <revisionHistory>
     <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <revision revision="2" summary="New data model format and notation"/>
-    <revision revision="3" summary="Added optional measurement clusters for energy and power"/>
   </revisionHistory>
   <classification superset="On/Off Light" class="simple" scope="endpoint"/>
   <conditions/>
@@ -114,12 +113,6 @@ Davis, CA 95616, USA
         </command>
       </commands>
     </cluster>
-    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
-      <optionalConform/>
-    </cluster>
-    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
-      <optionalConform/>
-    </cluster>
     <cluster id="0x0406" name="Occupancy Sensing" side="client">
       <optionalConform/>
     </cluster>
diff --git a/data_model/device_types/DimmablePlug-InUnit.xml b/data_model/device_types/DimmablePlug-InUnit.xml
index 0756ed62baf9c0..a41db3ad0ae255 100644
--- a/data_model/device_types/DimmablePlug-InUnit.xml
+++ b/data_model/device_types/DimmablePlug-InUnit.xml
@@ -60,7 +60,7 @@ Davis, CA 95616, USA
     <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <revision revision="2" summary="New data model format and notation"/>
-    <revision revision="3" summary="Added optional occupancy sensing and measurement clusters for energy and power"/>
+    <revision revision="3" summary="Added optional occupancy sensing"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
@@ -114,12 +114,6 @@ Davis, CA 95616, USA
         </command>
       </commands>
     </cluster>
-    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
-      <optionalConform/>
-    </cluster>
-    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
-      <optionalConform/>
-    </cluster>
     <cluster id="0x0406" name="Occupancy Sensing" side="client">
       <optionalConform/>
     </cluster>
diff --git a/data_model/device_types/DoorLockController.xml b/data_model/device_types/DoorLockController.xml
index a41cdad0e1bf5a..0e4529c8b5e381 100644
--- a/data_model/device_types/DoorLockController.xml
+++ b/data_model/device_types/DoorLockController.xml
@@ -63,16 +63,6 @@ Davis, CA 95616, USA
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <clusters>
-    <cluster id="0x0003" name="Identify" side="server">
-      <optionalConform>
-        <condition name="EZ-Target"/>
-      </optionalConform>
-    </cluster>
-    <cluster id="0x0003" name="Identify" side="client">
-      <optionalConform>
-        <condition name="EZ-Initiator"/>
-      </optionalConform>
-    </cluster>
     <cluster id="0x0004" name="Groups" side="client">
       <optionalConform/>
     </cluster>
diff --git a/data_model/device_types/EVSE.xml b/data_model/device_types/EVSE.xml
index 42636733090c9c..f15b1db770b454 100644
--- a/data_model/device_types/EVSE.xml
+++ b/data_model/device_types/EVSE.xml
@@ -68,12 +68,6 @@ Davis, CA 95616, USA
     <cluster id="0x0011" name="Power Source" side="server">
       <mandatoryConform/>
     </cluster>
-    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
-      <mandatoryConform/>
-    </cluster>
-    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
-      <mandatoryConform/>
-    </cluster>
     <cluster id="0x0098" name="Device Energy Management" side="server">
       <mandatoryConform/>
       <features>
diff --git a/data_model/device_types/ElectricalSensor.xml b/data_model/device_types/ElectricalSensor.xml
new file mode 100644
index 00000000000000..62c6dd9b4128b2
--- /dev/null
+++ b/data_model/device_types/ElectricalSensor.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0510" name="Electrical Sensor" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="utility" scope="endpoint"/>
+  <clusters>
+    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
+      <optionalConform choice="a" more="true"/>
+    </cluster>
+    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
+      <optionalConform choice="a" more="true"/>
+    </cluster>
+    <cluster id="0x009C" name="Power Topology" side="server">
+      <mandatoryConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/ExtendedColorLight.xml b/data_model/device_types/ExtendedColorLight.xml
index a0337009f660eb..73490485fa27fa 100644
--- a/data_model/device_types/ExtendedColorLight.xml
+++ b/data_model/device_types/ExtendedColorLight.xml
@@ -60,7 +60,7 @@ Davis, CA 95616, USA
     <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <revision revision="2" summary="New data model format and notation; integrate DM CCB 3501"/>
-    <revision revision="3" summary="Added optional occupancy sensing and measurement clusters for energy and power"/>
+    <revision revision="3" summary="Added optional occupancy sensing"/>
   </revisionHistory>
   <classification superset="Color Temperature Light" class="simple" scope="endpoint"/>
   <conditions/>
@@ -114,12 +114,6 @@ Davis, CA 95616, USA
         </command>
       </commands>
     </cluster>
-    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
-      <optionalConform/>
-    </cluster>
-    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
-      <optionalConform/>
-    </cluster>
     <cluster id="0x0300" name="Color Control" side="server">
       <mandatoryConform/>
       <features>
diff --git a/data_model/device_types/NetworkInfraManager.xml b/data_model/device_types/NetworkInfraManager.xml
index 750a97f22cad86..cc7e22295f40be 100644
--- a/data_model/device_types/NetworkInfraManager.xml
+++ b/data_model/device_types/NetworkInfraManager.xml
@@ -65,5 +65,8 @@ Davis, CA 95616, USA
     <cluster id="" name="Network Identity Management" side="server">
       <mandatoryConform/>
     </cluster>
+    <cluster id="" name="Wi" side="server">
+      <mandatoryConform/>
+    </cluster>
   </clusters>
 </deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/OnOffLight.xml b/data_model/device_types/OnOffLight.xml
index ea520612b9dc42..9762c718dcc05b 100644
--- a/data_model/device_types/OnOffLight.xml
+++ b/data_model/device_types/OnOffLight.xml
@@ -55,12 +55,11 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0100" name="On/Off Light" revision="3">
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0100" name="On/Off Light" revision="2">
   <revisionHistory>
     <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <revision revision="2" summary="New data model format and notation"/>
-    <revision revision="3" summary="Added optional measurement clusters for energy and power"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
@@ -114,12 +113,6 @@ Davis, CA 95616, USA
         </command>
       </commands>
     </cluster>
-    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
-      <optionalConform/>
-    </cluster>
-    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
-      <optionalConform/>
-    </cluster>
     <cluster id="0x0406" name="Occupancy Sensing" side="client">
       <optionalConform/>
     </cluster>
diff --git a/data_model/device_types/OnOffPlug-inUnit.xml b/data_model/device_types/OnOffPlug-inUnit.xml
index d63e3b22e81aae..41d0a1398ad6f3 100644
--- a/data_model/device_types/OnOffPlug-inUnit.xml
+++ b/data_model/device_types/OnOffPlug-inUnit.xml
@@ -55,12 +55,11 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x010A" name="On/Off Plug" revision="3">
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x010A" name="On/Off Plug" revision="2">
   <revisionHistory>
     <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <revision revision="2" summary="New data model format and notation"/>
-    <revision revision="3" summary="Added optional measurement clusters for energy and power"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
@@ -114,12 +113,6 @@ Davis, CA 95616, USA
         </command>
       </commands>
     </cluster>
-    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
-      <optionalConform/>
-    </cluster>
-    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
-      <optionalConform/>
-    </cluster>
     <cluster id="0x0406" name="Occupancy Sensing" side="client">
       <optionalConform/>
     </cluster>
diff --git a/data_model/device_types/PowerSource.xml b/data_model/device_types/PowerSource.xml
index 3767d5c19ad025..9ed71e905535bd 100644
--- a/data_model/device_types/PowerSource.xml
+++ b/data_model/device_types/PowerSource.xml
@@ -55,21 +55,14 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0011" name="Power Source" revision="2">
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0011" name="Power Source" revision="1">
   <classification class="utility" scope="node"/>
   <revisionHistory>
     <revision revision="1" summary="Initial Release"/>
-    <revision revision="2" summary="Added optional measurement clusters for energy and power"/>
   </revisionHistory>
   <clusters>
     <cluster id="0x002F" name="Power Source" side="server">
       <mandatoryConform/>
     </cluster>
-    <cluster id="0x0090" name="Electrical Power Measurement" side="server">
-      <optionalConform/>
-    </cluster>
-    <cluster id="0x0091" name="Electrical Energy Measurement" side="server">
-      <optionalConform/>
-    </cluster>
   </clusters>
 </deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/TemperatureControlledCabinet.xml b/data_model/device_types/TemperatureControlledCabinet.xml
index 090931ace14f61..b39861690cad61 100644
--- a/data_model/device_types/TemperatureControlledCabinet.xml
+++ b/data_model/device_types/TemperatureControlledCabinet.xml
@@ -66,6 +66,14 @@ Davis, CA 95616, USA
       <optionalConform>
         <attribute name="Heater"/>
       </optionalConform>
+      <commands>
+        <command id="" name="Pause">
+          <disallowConform/>
+        </command>
+        <command id="" name="Resume">
+          <disallowConform/>
+        </command>
+      </commands>
     </cluster>
     <cluster id="0x0049" name="Oven Mode" side="server">
       <optionalConform>
diff --git a/data_model/device_types/Thermostat.xml b/data_model/device_types/Thermostat.xml
index 8676fe965ef280..fc154468e97c5f 100644
--- a/data_model/device_types/Thermostat.xml
+++ b/data_model/device_types/Thermostat.xml
@@ -97,9 +97,6 @@ Davis, CA 95616, USA
     <cluster id="0x0062" name="Scenes Management" side="server">
       <optionalConform/>
     </cluster>
-    <cluster id="0x009B" name="Energy Preference" side="server">
-      <optionalConform/>
-    </cluster>
     <cluster id="0x0201" name="Thermostat" side="server">
       <mandatoryConform/>
     </cluster>
diff --git a/data_model/spec_sha b/data_model/spec_sha
index 9c275037d5b895..ec683a1872fc3e 100644
--- a/data_model/spec_sha
+++ b/data_model/spec_sha
@@ -1 +1 @@
-7e16e82e5264105bdc61d6bc8fe18095959b8292
+72ce960f71810d6ca96125aea54e4fb0a9631e34