diff --git a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml
index 4d03c539103970..f9671b92063ead 100644
--- a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml
@@ -58,17 +58,70 @@ limitations under the License.
- MeasuredValue
- MinMeasuredValue
- MaxMeasuredValue
- PeakMeasuredValue
- PeakMeasuredValueWindow
- AverageMeasuredValue
- AverageMeasuredValueWindow
- Uncertainty
- MeasurementUnit
- MeasurementMedium
- LevelValue
+
+ MeasuredValue
+
+
+
+
+
+ MinMeasuredValue
+
+
+
+
+
+ MaxMeasuredValue
+
+
+
+
+
+ PeakMeasuredValue
+
+
+
+
+
+ PeakMeasuredValueWindow
+
+
+
+
+
+ AverageMeasuredValue
+
+
+
+
+
+ AverageMeasuredValueWindow
+
+
+
+
+
+ Uncertainty
+
+
+
+
+
+ MeasurementUnit
+
+
+
+
+
+ MeasurementMedium
+
+
+
+ LevelValue
+
+
+
+
@@ -113,17 +166,70 @@ limitations under the License.
- MeasuredValue
- MinMeasuredValue
- MaxMeasuredValue
- PeakMeasuredValue
- PeakMeasuredValueWindow
- AverageMeasuredValue
- AverageMeasuredValueWindow
- Uncertainty
- MeasurementUnit
- MeasurementMedium
- LevelValue
+
+ MeasuredValue
+
+
+
+
+
+ MinMeasuredValue
+
+
+
+
+
+ MaxMeasuredValue
+
+
+
+
+
+ PeakMeasuredValue
+
+
+
+
+
+ PeakMeasuredValueWindow
+
+
+
+
+
+ AverageMeasuredValue
+
+
+
+
+
+ AverageMeasuredValueWindow
+
+
+
+
+
+ Uncertainty
+
+
+
+
+
+ MeasurementUnit
+
+
+
+
+
+ MeasurementMedium
+
+
+
+ LevelValue
+
+
+
+
@@ -167,17 +273,70 @@ limitations under the License.
- MeasuredValue
- MinMeasuredValue
- MaxMeasuredValue
- PeakMeasuredValue
- PeakMeasuredValueWindow
- AverageMeasuredValue
- AverageMeasuredValueWindow
- Uncertainty
- MeasurementUnit
- MeasurementMedium
- LevelValue
+
+ MeasuredValue
+
+
+
+
+
+ MinMeasuredValue
+
+
+
+
+
+ MaxMeasuredValue
+
+
+
+
+
+ PeakMeasuredValue
+
+
+
+
+
+ PeakMeasuredValueWindow
+
+
+
+
+
+ AverageMeasuredValue
+
+
+
+
+
+ AverageMeasuredValueWindow
+
+
+
+
+
+ Uncertainty
+
+
+
+
+
+ MeasurementUnit
+
+
+
+
+
+ MeasurementMedium
+
+
+
+ LevelValue
+
+
+
+
@@ -221,17 +380,70 @@ limitations under the License.
- MeasuredValue
- MinMeasuredValue
- MaxMeasuredValue
- PeakMeasuredValue
- PeakMeasuredValueWindow
- AverageMeasuredValue
- AverageMeasuredValueWindow
- Uncertainty
- MeasurementUnit
- MeasurementMedium
- LevelValue
+
+ MeasuredValue
+
+
+
+
+
+ MinMeasuredValue
+
+
+
+
+
+ MaxMeasuredValue
+
+
+
+
+
+ PeakMeasuredValue
+
+
+
+
+
+ PeakMeasuredValueWindow
+
+
+
+
+
+ AverageMeasuredValue
+
+
+
+
+
+ AverageMeasuredValueWindow
+
+
+
+
+
+ Uncertainty
+
+
+
+
+
+ MeasurementUnit
+
+
+
+
+
+ MeasurementMedium
+
+
+
+ LevelValue
+
+
+
+
@@ -275,17 +487,70 @@ limitations under the License.
- MeasuredValue
- MinMeasuredValue
- MaxMeasuredValue
- PeakMeasuredValue
- PeakMeasuredValueWindow
- AverageMeasuredValue
- AverageMeasuredValueWindow
- Uncertainty
- MeasurementUnit
- MeasurementMedium
- LevelValue
+
+ MeasuredValue
+
+
+
+
+
+ MinMeasuredValue
+
+
+
+
+
+ MaxMeasuredValue
+
+
+
+
+
+ PeakMeasuredValue
+
+
+
+
+
+ PeakMeasuredValueWindow
+
+
+
+
+
+ AverageMeasuredValue
+
+
+
+
+
+ AverageMeasuredValueWindow
+
+
+
+
+
+ Uncertainty
+
+
+
+
+
+ MeasurementUnit
+
+
+
+
+
+ MeasurementMedium
+
+
+
+ LevelValue
+
+
+
+
@@ -329,17 +594,70 @@ limitations under the License.
- MeasuredValue
- MinMeasuredValue
- MaxMeasuredValue
- PeakMeasuredValue
- PeakMeasuredValueWindow
- AverageMeasuredValue
- AverageMeasuredValueWindow
- Uncertainty
- MeasurementUnit
- MeasurementMedium
- LevelValue
+
+ MeasuredValue
+
+
+
+
+
+ MinMeasuredValue
+
+
+
+
+
+ MaxMeasuredValue
+
+
+
+
+
+ PeakMeasuredValue
+
+
+
+
+
+ PeakMeasuredValueWindow
+
+
+
+
+
+ AverageMeasuredValue
+
+
+
+
+
+ AverageMeasuredValueWindow
+
+
+
+
+
+ Uncertainty
+
+
+
+
+
+ MeasurementUnit
+
+
+
+
+
+ MeasurementMedium
+
+
+
+ LevelValue
+
+
+
+
@@ -383,17 +701,70 @@ limitations under the License.
- MeasuredValue
- MinMeasuredValue
- MaxMeasuredValue
- PeakMeasuredValue
- PeakMeasuredValueWindow
- AverageMeasuredValue
- AverageMeasuredValueWindow
- Uncertainty
- MeasurementUnit
- MeasurementMedium
- LevelValue
+
+ MeasuredValue
+
+
+
+
+
+ MinMeasuredValue
+
+
+
+
+
+ MaxMeasuredValue
+
+
+
+
+
+ PeakMeasuredValue
+
+
+
+
+
+ PeakMeasuredValueWindow
+
+
+
+
+
+ AverageMeasuredValue
+
+
+
+
+
+ AverageMeasuredValueWindow
+
+
+
+
+
+ Uncertainty
+
+
+
+
+
+ MeasurementUnit
+
+
+
+
+
+ MeasurementMedium
+
+
+
+ LevelValue
+
+
+
+
@@ -437,17 +808,70 @@ limitations under the License.
- MeasuredValue
- MinMeasuredValue
- MaxMeasuredValue
- PeakMeasuredValue
- PeakMeasuredValueWindow
- AverageMeasuredValue
- AverageMeasuredValueWindow
- Uncertainty
- MeasurementUnit
- MeasurementMedium
- LevelValue
+
+ MeasuredValue
+
+
+
+
+
+ MinMeasuredValue
+
+
+
+
+
+ MaxMeasuredValue
+
+
+
+
+
+ PeakMeasuredValue
+
+
+
+
+
+ PeakMeasuredValueWindow
+
+
+
+
+
+ AverageMeasuredValue
+
+
+
+
+
+ AverageMeasuredValueWindow
+
+
+
+
+
+ Uncertainty
+
+
+
+
+
+ MeasurementUnit
+
+
+
+
+
+ MeasurementMedium
+
+
+
+ LevelValue
+
+
+
+
@@ -491,17 +915,70 @@ limitations under the License.
- MeasuredValue
- MinMeasuredValue
- MaxMeasuredValue
- PeakMeasuredValue
- PeakMeasuredValueWindow
- AverageMeasuredValue
- AverageMeasuredValueWindow
- Uncertainty
- MeasurementUnit
- MeasurementMedium
- LevelValue
+
+ MeasuredValue
+
+
+
+
+
+ MinMeasuredValue
+
+
+
+
+
+ MaxMeasuredValue
+
+
+
+
+
+ PeakMeasuredValue
+
+
+
+
+
+ PeakMeasuredValueWindow
+
+
+
+
+
+ AverageMeasuredValue
+
+
+
+
+
+ AverageMeasuredValueWindow
+
+
+
+
+
+ Uncertainty
+
+
+
+
+
+ MeasurementUnit
+
+
+
+
+
+ MeasurementMedium
+
+
+
+ LevelValue
+
+
+
+
@@ -545,17 +1022,70 @@ limitations under the License.
- MeasuredValue
- MinMeasuredValue
- MaxMeasuredValue
- PeakMeasuredValue
- PeakMeasuredValueWindow
- AverageMeasuredValue
- AverageMeasuredValueWindow
- Uncertainty
- MeasurementUnit
- MeasurementMedium
- LevelValue
+
+ MeasuredValue
+
+
+
+
+
+ MinMeasuredValue
+
+
+
+
+
+ MaxMeasuredValue
+
+
+
+
+
+ PeakMeasuredValue
+
+
+
+
+
+ PeakMeasuredValueWindow
+
+
+
+
+
+ AverageMeasuredValue
+
+
+
+
+
+ AverageMeasuredValueWindow
+
+
+
+
+
+ Uncertainty
+
+
+
+
+
+ MeasurementUnit
+
+
+
+
+
+ MeasurementMedium
+
+
+
+ LevelValue
+
+
+
+