From a7b69820d48fbac638715106b9e5a9dc2f9dff67 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Fri, 13 Sep 2024 20:05:20 +0000
Subject: [PATCH] Restyled by prettier-json

---
 .../zcl/zcl-with-test-extensions.json         | 1447 ++++++++---------
 src/app/zap-templates/zcl/zcl.json            | 1439 ++++++++--------
 src/app/zap_cluster_list.json                 |  798 ++++-----
 3 files changed, 1689 insertions(+), 1995 deletions(-)

diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
index 64c8668e63f17b..bc1a29c4b4aa3b 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -1,762 +1,695 @@
 {
-  "description": "Matter SDK ZCL data with some extensions",
-  "category": "matter",
-  "version": 1,
-  "requiredFeatureLevel": 102,
-  "xmlRoot": [
-    ".",
-    "./data-model/chip/",
-    "./data-model/silabs/",
-    "./data-model/test"
-  ],
-  "_comment": "Ensure access-control-definitions.xml is first in xmlFile array",
-  "xmlFile": [
-    "access-control-definitions.xml",
-    "chip-types.xml",
-    "access-control-cluster.xml",
-    "account-login-cluster.xml",
-    "administrator-commissioning-cluster.xml",
-    "air-quality-cluster.xml",
-    "application-basic-cluster.xml",
-    "application-launcher-cluster.xml",
-    "audio-output-cluster.xml",
-    "ballast-configuration-cluster.xml",
-    "basic-information-cluster.xml",
-    "binding-cluster.xml",
-    "boolean-state-cluster.xml",
-    "boolean-state-configuration-cluster.xml",
-    "actions-cluster.xml",
-    "bridged-device-basic-information.xml",
-    "chip-ota.xml",
-    "channel-cluster.xml",
-    "clusters-extensions.xml",
-    "color-control-cluster.xml",
-    "commissioner-control-cluster.xml",
-    "concentration-measurement-cluster.xml",
-    "content-launch-cluster.xml",
-    "content-app-observer-cluster.xml",
-    "content-control-cluster.xml",
-    "descriptor-cluster.xml",
-    "device-energy-management-cluster.xml",
-    "device-energy-management-mode-cluster.xml",
-    "diagnostic-logs-cluster.xml",
-    "dishwasher-alarm-cluster.xml",
-    "dishwasher-mode-cluster.xml",
-    "drlc-cluster.xml",
-    "microwave-oven-mode-cluster.xml",
-    "microwave-oven-control-cluster.xml",
-    "door-lock-cluster.xml",
-    "ecosystem-information-cluster.xml",
-    "energy-preference-cluster.xml",
-    "electrical-energy-measurement-cluster.xml",
-    "electrical-power-measurement-cluster.xml",
-    "energy-evse-cluster.xml",
-    "energy-evse-mode-cluster.xml",
-    "ethernet-network-diagnostics-cluster.xml",
-    "fan-control-cluster.xml",
-    "fault-injection-cluster.xml",
-    "fixed-label-cluster.xml",
-    "flow-measurement-cluster.xml",
-    "general-commissioning-cluster.xml",
-    "general-diagnostics-cluster.xml",
-    "global-attributes.xml",
-    "global-bitmaps.xml",
-    "global-enums.xml",
-    "global-structs.xml",
-    "groups-cluster.xml",
-    "group-key-mgmt-cluster.xml",
-    "icd-management-cluster.xml",
-    "identify-cluster.xml",
-    "illuminance-measurement-cluster.xml",
-    "keypad-input-cluster.xml",
-    "laundry-washer-mode-cluster.xml",
-    "laundry-dryer-controls-cluster.xml",
-    "level-control-cluster.xml",
-    "localization-configuration-cluster.xml",
-    "low-power-cluster.xml",
-    "measurement-and-sensing.xml",
-    "media-input-cluster.xml",
-    "media-playback-cluster.xml",
-    "messages-cluster.xml",
-    "mode-base-cluster.xml",
-    "mode-select-cluster.xml",
-    "mode-select-extensions.xml",
-    "semantic-tag-namespace-enums.xml",
-    "network-commissioning-cluster.xml",
-    "occupancy-sensing-cluster.xml",
-    "onoff-cluster.xml",
-    "operational-credentials-cluster.xml",
-    "operational-state-cluster.xml",
-    "operational-state-oven-cluster.xml",
-    "operational-state-rvc-cluster.xml",
-    "oven-mode-cluster.xml",
-    "power-topology-cluster.xml",
-    "pressure-measurement-cluster.xml",
-    "power-source-cluster.xml",
-    "power-source-configuration-cluster.xml",
-    "proxy-configuration-cluster.xml",
-    "proxy-discovery-cluster.xml",
-    "proxy-valid-cluster.xml",
-    "pump-configuration-and-control-cluster.xml",
-    "pwm-cluster.xml",
-    "refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml",
-    "refrigerator-alarm.xml",
-    "relative-humidity-measurement-cluster.xml",
-    "replacable-monitoring-cluster.xml",
-    "rvc-clean-mode-cluster.xml ",
-    "rvc-run-mode-cluster.xml",
-    "resource-monitoring-cluster.xml",
-    "scene.xml",
-    "service-area-cluster.xml",
-    "smoke-co-alarm-cluster.xml",
-    "software-diagnostics-cluster.xml",
-    "switch-cluster.xml",
-    "target-navigator-cluster.xml",
-    "temperature-control-cluster.xml",
-    "temperature-measurement-cluster.xml",
-    "test-cluster.xml",
-    "thermostat-cluster.xml",
-    "thermostat-user-interface-configuration-cluster.xml",
-    "thread-border-router-management-cluster.xml",
-    "thread-network-diagnostics-cluster.xml",
-    "thread-network-directory-cluster.xml",
-    "time-format-localization-cluster.xml",
-    "time-synchronization-cluster.xml",
-    "timer-cluster.xml",
-    "user-label-cluster.xml",
-    "unit-localization-cluster.xml",
-    "valve-configuration-and-control-cluster.xml",
-    "wake-on-lan-cluster.xml",
-    "washer-controls-cluster.xml",
-    "water-heater-management-cluster.xml",
-    "water-heater-mode-cluster.xml",
-    "wifi-network-diagnostics-cluster.xml",
-    "wifi-network-management-cluster.xml",
-    "window-covering.xml",
-    "matter-devices.xml",
-    "sample-mei-cluster.xml",
-    "types/door-lock.xml",
-    "types/occupancy-sensing.xml",
-    "types/thermostat-user-interface-configuration.xml"
-  ],
-  "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
-  "options": {
-    "text": {
-      "defaultResponsePolicy": [
-        "Always",
-        "Conditional",
-        "Never"
-      ]
+    "description": "Matter SDK ZCL data with some extensions",
+    "category": "matter",
+    "version": 1,
+    "requiredFeatureLevel": 102,
+    "xmlRoot": [
+        ".",
+        "./data-model/chip/",
+        "./data-model/silabs/",
+        "./data-model/test"
+    ],
+    "_comment": "Ensure access-control-definitions.xml is first in xmlFile array",
+    "xmlFile": [
+        "access-control-definitions.xml",
+        "chip-types.xml",
+        "access-control-cluster.xml",
+        "account-login-cluster.xml",
+        "administrator-commissioning-cluster.xml",
+        "air-quality-cluster.xml",
+        "application-basic-cluster.xml",
+        "application-launcher-cluster.xml",
+        "audio-output-cluster.xml",
+        "ballast-configuration-cluster.xml",
+        "basic-information-cluster.xml",
+        "binding-cluster.xml",
+        "boolean-state-cluster.xml",
+        "boolean-state-configuration-cluster.xml",
+        "actions-cluster.xml",
+        "bridged-device-basic-information.xml",
+        "chip-ota.xml",
+        "channel-cluster.xml",
+        "clusters-extensions.xml",
+        "color-control-cluster.xml",
+        "commissioner-control-cluster.xml",
+        "concentration-measurement-cluster.xml",
+        "content-launch-cluster.xml",
+        "content-app-observer-cluster.xml",
+        "content-control-cluster.xml",
+        "descriptor-cluster.xml",
+        "device-energy-management-cluster.xml",
+        "device-energy-management-mode-cluster.xml",
+        "diagnostic-logs-cluster.xml",
+        "dishwasher-alarm-cluster.xml",
+        "dishwasher-mode-cluster.xml",
+        "drlc-cluster.xml",
+        "microwave-oven-mode-cluster.xml",
+        "microwave-oven-control-cluster.xml",
+        "door-lock-cluster.xml",
+        "ecosystem-information-cluster.xml",
+        "energy-preference-cluster.xml",
+        "electrical-energy-measurement-cluster.xml",
+        "electrical-power-measurement-cluster.xml",
+        "energy-evse-cluster.xml",
+        "energy-evse-mode-cluster.xml",
+        "ethernet-network-diagnostics-cluster.xml",
+        "fan-control-cluster.xml",
+        "fault-injection-cluster.xml",
+        "fixed-label-cluster.xml",
+        "flow-measurement-cluster.xml",
+        "general-commissioning-cluster.xml",
+        "general-diagnostics-cluster.xml",
+        "global-attributes.xml",
+        "global-bitmaps.xml",
+        "global-enums.xml",
+        "global-structs.xml",
+        "groups-cluster.xml",
+        "group-key-mgmt-cluster.xml",
+        "icd-management-cluster.xml",
+        "identify-cluster.xml",
+        "illuminance-measurement-cluster.xml",
+        "keypad-input-cluster.xml",
+        "laundry-washer-mode-cluster.xml",
+        "laundry-dryer-controls-cluster.xml",
+        "level-control-cluster.xml",
+        "localization-configuration-cluster.xml",
+        "low-power-cluster.xml",
+        "measurement-and-sensing.xml",
+        "media-input-cluster.xml",
+        "media-playback-cluster.xml",
+        "messages-cluster.xml",
+        "mode-base-cluster.xml",
+        "mode-select-cluster.xml",
+        "mode-select-extensions.xml",
+        "semantic-tag-namespace-enums.xml",
+        "network-commissioning-cluster.xml",
+        "occupancy-sensing-cluster.xml",
+        "onoff-cluster.xml",
+        "operational-credentials-cluster.xml",
+        "operational-state-cluster.xml",
+        "operational-state-oven-cluster.xml",
+        "operational-state-rvc-cluster.xml",
+        "oven-mode-cluster.xml",
+        "power-topology-cluster.xml",
+        "pressure-measurement-cluster.xml",
+        "power-source-cluster.xml",
+        "power-source-configuration-cluster.xml",
+        "proxy-configuration-cluster.xml",
+        "proxy-discovery-cluster.xml",
+        "proxy-valid-cluster.xml",
+        "pump-configuration-and-control-cluster.xml",
+        "pwm-cluster.xml",
+        "refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml",
+        "refrigerator-alarm.xml",
+        "relative-humidity-measurement-cluster.xml",
+        "replacable-monitoring-cluster.xml",
+        "rvc-clean-mode-cluster.xml ",
+        "rvc-run-mode-cluster.xml",
+        "resource-monitoring-cluster.xml",
+        "scene.xml",
+        "service-area-cluster.xml",
+        "smoke-co-alarm-cluster.xml",
+        "software-diagnostics-cluster.xml",
+        "switch-cluster.xml",
+        "target-navigator-cluster.xml",
+        "temperature-control-cluster.xml",
+        "temperature-measurement-cluster.xml",
+        "test-cluster.xml",
+        "thermostat-cluster.xml",
+        "thermostat-user-interface-configuration-cluster.xml",
+        "thread-border-router-management-cluster.xml",
+        "thread-network-diagnostics-cluster.xml",
+        "thread-network-directory-cluster.xml",
+        "time-format-localization-cluster.xml",
+        "time-synchronization-cluster.xml",
+        "timer-cluster.xml",
+        "user-label-cluster.xml",
+        "unit-localization-cluster.xml",
+        "valve-configuration-and-control-cluster.xml",
+        "wake-on-lan-cluster.xml",
+        "washer-controls-cluster.xml",
+        "water-heater-management-cluster.xml",
+        "water-heater-mode-cluster.xml",
+        "wifi-network-diagnostics-cluster.xml",
+        "wifi-network-management-cluster.xml",
+        "window-covering.xml",
+        "matter-devices.xml",
+        "sample-mei-cluster.xml",
+        "types/door-lock.xml",
+        "types/occupancy-sensing.xml",
+        "types/thermostat-user-interface-configuration.xml"
+    ],
+    "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
+    "options": {
+        "text": {
+            "defaultResponsePolicy": ["Always", "Conditional", "Never"]
+        },
+        "bool": ["commandDiscovery"]
     },
-    "bool": [
-      "commandDiscovery"
-    ]
-  },
-  "defaults": {
-    "text": {
-      "manufacturerCodes": "0x1002",
-      "defaultResponsePolicy": "always"
+    "defaults": {
+        "text": {
+            "manufacturerCodes": "0x1002",
+            "defaultResponsePolicy": "always"
+        },
+        "bool": {
+            "commandDiscovery": true
+        }
     },
-    "bool": {
-      "commandDiscovery": true
+    "listsUseAttributeAccessInterface": true,
+    "attributeAccessInterfaceAttributes": {
+        "Access Control": [
+            "ClusterRevision",
+            "SubjectsPerAccessControlEntry",
+            "TargetsPerAccessControlEntry",
+            "AccessControlEntriesPerFabric"
+        ],
+        "Administrator Commissioning": [
+            "WindowStatus",
+            "AdminFabricIndex",
+            "AdminVendorId"
+        ],
+        "Basic Information": [
+            "DataModelRevision",
+            "VendorName",
+            "VendorID",
+            "ProductName",
+            "ProductID",
+            "Location",
+            "HardwareVersion",
+            "HardwareVersionString",
+            "SoftwareVersion",
+            "SoftwareVersionString",
+            "ManufacturingDate",
+            "PartNumber",
+            "ProductURL",
+            "ProductLabel",
+            "SerialNumber",
+            "UniqueID",
+            "CapabilityMinima",
+            "ProductAppearance",
+            "SpecificationVersion",
+            "MaxPathsPerInvoke"
+        ],
+        "Bridged Device Basic Information": ["ProductAppearance"],
+        "Descriptor": ["ClusterRevision", "FeatureMap"],
+        "Device Energy Management": [
+            "ESAType",
+            "ESACanGenerate",
+            "ESAState",
+            "AbsMinPower",
+            "AbsMaxPower",
+            "PowerAdjustmentCapability",
+            "Forecast",
+            "OptOutState",
+            "FeatureMap"
+        ],
+        "Device Energy Management Mode": [
+            "SupportedModes",
+            "CurrentMode",
+            "FeatureMap"
+        ],
+        "Door Lock": [
+            "AliroReaderVerificationKey",
+            "AliroReaderGroupIdentifier",
+            "AliroReaderGroupSubIdentifier",
+            "AliroGroupResolvingKey",
+            "AliroBLEAdvertisingVersion",
+            "NumberOfAliroCredentialIssuerKeysSupported",
+            "NumberOfAliroEndpointKeysSupported"
+        ],
+        "Energy EVSE": [
+            "State",
+            "SupplyState",
+            "FaultState",
+            "ChargingEnabledUntil",
+            "DischargingEnabledUntil",
+            "CircuitCapacity",
+            "MinimumChargeCurrent",
+            "MaximumChargeCurrent",
+            "MaximumDischargeCurrent",
+            "UserMaximumChargeCurrent",
+            "RandomizationDelayWindow",
+            "NextChargeStartTime",
+            "NextChargeTargetTime",
+            "NextChargeRequiredEnergy",
+            "NextChargeTargetSoC",
+            "ApproximateEVEfficiency",
+            "StateOfCharge",
+            "BatteryCapacity",
+            "VehicleID",
+            "SessionID",
+            "SessionDuration",
+            "SessionEnergyCharged",
+            "SessionEnergyDischarged",
+            "FeatureMap"
+        ],
+        "Energy EVSE Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
+        "Ethernet Network Diagnostics": [
+            "PHYRate",
+            "FullDuplex",
+            "CarrierDetect",
+            "TimeSinceReset",
+            "PacketRxCount",
+            "PacketTxCount",
+            "TxErrCount",
+            "CollisionCount",
+            "OverrunCount"
+        ],
+        "General Commissioning": [
+            "RegulatoryConfig",
+            "LocationCapability",
+            "BasicCommissioningInfo",
+            "SupportsConcurrentConnection"
+        ],
+        "General Diagnostics": [
+            "NetworkInterfaces",
+            "ActiveHardwareFaults",
+            "ActiveRadioFaults",
+            "ActiveNetworkFaults",
+            "RebootCount",
+            "UpTime",
+            "TotalOperationalHours",
+            "BootReason",
+            "FeatureMap",
+            "ClusterRevision"
+        ],
+        "Group Key Management": [
+            "ClusterRevision",
+            "MaxGroupsPerFabric",
+            "MaxGroupKeysPerFabric",
+            "FeatureMap"
+        ],
+        "ICD Management": [
+            "IdleModeDuration",
+            "ActiveModeDuration",
+            "ActiveModeThreshold",
+            "RegisteredClients",
+            "ICDCounter",
+            "ClientsSupportedPerFabric",
+            "MaximumCheckInBackOff"
+        ],
+        "Occupancy Sensing": ["HoldTimeLimits", "HoldTime", "FeatureMap"],
+        "Operational Credentials": [
+            "SupportedFabrics",
+            "CommissionedFabrics",
+            "CurrentFabricIndex"
+        ],
+        "Software Diagnostics": [
+            "CurrentHeapFree",
+            "CurrentHeapHighWatermark",
+            "CurrentHeapUsed",
+            "FeatureMap",
+            "ThreadMetrics"
+        ],
+        "Unit Testing": [
+            "struct_attr",
+            "nullable_struct",
+            "general_error_boolean",
+            "cluster_error_boolean",
+            "global_struct",
+            "nullable_global_struct"
+        ],
+        "Thread Border Router Management": [
+            "BorderRouterName",
+            "BorderAgentID",
+            "ThreadVersion",
+            "InterfaceEnabled",
+            "ActiveDatasetTimestamp",
+            "PendingDatasetTimestamp",
+            "FeatureMap"
+        ],
+        "Thread Network Diagnostics": [
+            "Channel",
+            "RoutingRole",
+            "NetworkName",
+            "PanId",
+            "ExtendedPanId",
+            "MeshLocalPrefix",
+            "OverrunCount",
+            "PartitionId",
+            "Weighting",
+            "DataVersion",
+            "StableDataVersion",
+            "LeaderRouterId",
+            "DetachedRoleCount",
+            "ChildRoleCount",
+            "RouterRoleCount",
+            "LeaderRoleCount",
+            "AttachAttemptCount",
+            "PartitionIdChangeCount",
+            "BetterPartitionAttachAttemptCount",
+            "ParentChangeCount",
+            "TxTotalCount",
+            "TxUnicastCount",
+            "TxBroadcastCount",
+            "TxAckRequestedCount",
+            "TxAckedCount",
+            "TxNoAckRequestedCount",
+            "TxDataCount",
+            "TxDataPollCount",
+            "TxBeaconCount",
+            "TxBeaconRequestCount",
+            "TxOtherCount",
+            "TxRetryCount",
+            "TxDirectMaxRetryExpiryCount",
+            "TxIndirectMaxRetryExpiryCount",
+            "TxErrCcaCount",
+            "TxErrAbortCount",
+            "TxErrBusyChannelCount",
+            "RxTotalCount",
+            "RxUnicastCount",
+            "RxBroadcastCount",
+            "RxDataCount",
+            "RxDataPollCount",
+            "RxBeaconCount",
+            "RxBeaconRequestCount",
+            "RxOtherCount",
+            "RxAddressFilteredCount",
+            "RxDestAddrFilteredCount",
+            "RxDuplicatedCount",
+            "RxErrNoFrameCount",
+            "RxErrUnknownNeighborCount",
+            "RxErrInvalidSrcAddrCount",
+            "RxErrSecCount",
+            "RxErrFcsCount",
+            "RxErrOtherCount",
+            "ActiveTimestamp",
+            "PendingTimestamp",
+            "Delay",
+            "SecurityPolicy",
+            "ChannelPage0Mask",
+            "OperationalDatasetComponents"
+        ],
+        "Wi-Fi Network Diagnostics": [
+            "BSSID",
+            "SecurityType",
+            "WiFiVersion",
+            "ChannelNumber",
+            "RSSI",
+            "BeaconLostCount",
+            "BeaconRxCount",
+            "PacketMulticastRxCount",
+            "PacketMulticastTxCount",
+            "PacketUnicastRxCount",
+            "PacketUnicastTxCount",
+            "CurrentMaxRate",
+            "OverrunCount"
+        ],
+        "Channel": ["Lineup", "CurrentChannel"],
+        "Media Playback": [
+            "SampledPosition",
+            "ActiveAudioTrack",
+            "ActiveTextTrack"
+        ],
+        "Application Launcher": ["CurrentApp"],
+        "Application Basic": ["Application"],
+        "Time Synchronization": [
+            "TrustedTimeSource",
+            "DefaultNTP",
+            "TimeZone",
+            "DSTOffset",
+            "UTCTime",
+            "LocalTime",
+            "Granularity",
+            "TimeZoneListMaxSize",
+            "DSTOffsetListMaxSize"
+        ],
+        "Temperature Control": ["SupportedTemperatureLevels"],
+        "Dishwasher Mode": [
+            "SupportedModes",
+            "CurrentMode",
+            "StartUpMode",
+            "OnMode",
+            "FeatureMap"
+        ],
+        "Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
+        "Microwave Oven Control": [
+            "CookTime",
+            "MaxCookTime",
+            "PowerSetting",
+            "MinPower",
+            "MaxPower",
+            "PowerStep",
+            "SupportedWatts",
+            "SelectedWattIndex",
+            "WattRating",
+            "FeatureMap"
+        ],
+        "Laundry Washer Mode": [
+            "SupportedModes",
+            "CurrentMode",
+            "StartUpMode",
+            "OnMode",
+            "FeatureMap"
+        ],
+        "Refrigerator And Temperature Controlled Cabinet Mode": [
+            "SupportedModes",
+            "CurrentMode",
+            "StartUpMode",
+            "OnMode",
+            "FeatureMap"
+        ],
+        "RVC Clean Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
+        "RVC Run Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
+        "Operational State": [
+            "OperationalState",
+            "OperationalError",
+            "CurrentPhase",
+            "CountdownTime"
+        ],
+        "RVC Operational State": [
+            "OperationalState",
+            "OperationalError",
+            "CurrentPhase",
+            "CountdownTime"
+        ],
+        "Oven Cavity Operational State": [
+            "OperationalState",
+            "OperationalError",
+            "CurrentPhase",
+            "CountdownTime"
+        ],
+        "Activated Carbon Filter Monitoring": [
+            "Condition",
+            "DegradationDirection",
+            "ChangeIndication",
+            "InPlaceIndicator",
+            "LastChangedTime",
+            "ReplacementProductList",
+            "FeatureMap"
+        ],
+        "HEPA Filter Monitoring": [
+            "Condition",
+            "DegradationDirection",
+            "ChangeIndication",
+            "InPlaceIndicator",
+            "LastChangedTime",
+            "ReplacementProductList",
+            "FeatureMap"
+        ],
+        "Carbon Monoxide Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "Carbon Dioxide Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "Nitrogen Dioxide Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "Ozone Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "PM2.5 Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "Formaldehyde Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "PM1 Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "PM10 Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "Total Volatile Organic Compounds Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "Radon Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "Air Quality": ["AirQuality", "FeatureMap"],
+        "Electrical Energy Measurement": [
+            "Accuracy",
+            "CumulativeEnergyImported",
+            "CumulativeEnergyExported",
+            "PeriodicEnergyImported",
+            "PeriodicEnergyExported",
+            "CumulativeEnergyReset",
+            "FeatureMap"
+        ],
+        "Electrical Power Measurement": [
+            "PowerMode",
+            "NumberOfMeasurementTypes",
+            "Accuracy",
+            "Ranges",
+            "Voltage",
+            "ActiveCurrent",
+            "ReactiveCurrent",
+            "ApparentCurrent",
+            "ActivePower",
+            "ReactivePower",
+            "ApparentPower",
+            "RMSVoltage",
+            "RMSCurrent",
+            "RMSPower",
+            "Frequency",
+            "HarmonicCurrents",
+            "HarmonicPhases",
+            "PowerFactor",
+            "NeutralCurrent",
+            "FeatureMap"
+        ],
+        "Power Topology": ["FeatureMap"],
+        "Valve Configuration and Control": ["RemainingDuration"],
+        "Boolean State Configuration": ["CurrentSensitivityLevel"],
+        "Water Heater Management": [
+            "HeaterTypes",
+            "HeatDemand",
+            "TankVolume",
+            "EstimatedHeatRequired",
+            "TankPercentage",
+            "BoostState",
+            "FeatureMap",
+            "ClusterRevision"
+        ],
+        "Water Heater Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
+        "Wi-Fi Network Management": ["SSID", "PassphraseSurrogate"],
+        "Thread Network Directory": [
+            "PreferredExtendedPanID",
+            "ThreadNetworks",
+            "ThreadNetworkTableSize"
+        ],
+        "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
+    },
+    "defaultReportingPolicy": "mandatory",
+    "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],
+    "fabricHandling": {
+        "automaticallyCreateFields": true,
+        "indexFieldId": 254,
+        "indexFieldName": "FabricIndex",
+        "indexType": "fabric_idx"
+    },
+    "uiOptions": {
+        "showProfileId": false
     }
-  },
-  "listsUseAttributeAccessInterface": true,
-  "attributeAccessInterfaceAttributes": {
-    "Access Control": [
-      "ClusterRevision",
-      "SubjectsPerAccessControlEntry",
-      "TargetsPerAccessControlEntry",
-      "AccessControlEntriesPerFabric"
-    ],
-    "Administrator Commissioning": [
-      "WindowStatus",
-      "AdminFabricIndex",
-      "AdminVendorId"
-    ],
-    "Basic Information": [
-      "DataModelRevision",
-      "VendorName",
-      "VendorID",
-      "ProductName",
-      "ProductID",
-      "Location",
-      "HardwareVersion",
-      "HardwareVersionString",
-      "SoftwareVersion",
-      "SoftwareVersionString",
-      "ManufacturingDate",
-      "PartNumber",
-      "ProductURL",
-      "ProductLabel",
-      "SerialNumber",
-      "UniqueID",
-      "CapabilityMinima",
-      "ProductAppearance",
-      "SpecificationVersion",
-      "MaxPathsPerInvoke"
-    ],
-    "Bridged Device Basic Information": [
-      "ProductAppearance"
-    ],
-    "Descriptor": [
-      "ClusterRevision",
-      "FeatureMap"
-    ],
-    "Device Energy Management": [
-      "ESAType",
-      "ESACanGenerate",
-      "ESAState",
-      "AbsMinPower",
-      "AbsMaxPower",
-      "PowerAdjustmentCapability",
-      "Forecast",
-      "OptOutState",
-      "FeatureMap"
-    ],
-    "Device Energy Management Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "FeatureMap"
-    ],
-    "Door Lock": [
-      "AliroReaderVerificationKey",
-      "AliroReaderGroupIdentifier",
-      "AliroReaderGroupSubIdentifier",
-      "AliroGroupResolvingKey",
-      "AliroBLEAdvertisingVersion",
-      "NumberOfAliroCredentialIssuerKeysSupported",
-      "NumberOfAliroEndpointKeysSupported"
-    ],
-    "Energy EVSE": [
-      "State",
-      "SupplyState",
-      "FaultState",
-      "ChargingEnabledUntil",
-      "DischargingEnabledUntil",
-      "CircuitCapacity",
-      "MinimumChargeCurrent",
-      "MaximumChargeCurrent",
-      "MaximumDischargeCurrent",
-      "UserMaximumChargeCurrent",
-      "RandomizationDelayWindow",
-      "NextChargeStartTime",
-      "NextChargeTargetTime",
-      "NextChargeRequiredEnergy",
-      "NextChargeTargetSoC",
-      "ApproximateEVEfficiency",
-      "StateOfCharge",
-      "BatteryCapacity",
-      "VehicleID",
-      "SessionID",
-      "SessionDuration",
-      "SessionEnergyCharged",
-      "SessionEnergyDischarged",
-      "FeatureMap"
-    ],
-    "Energy EVSE Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "FeatureMap"
-    ],
-    "Ethernet Network Diagnostics": [
-      "PHYRate",
-      "FullDuplex",
-      "CarrierDetect",
-      "TimeSinceReset",
-      "PacketRxCount",
-      "PacketTxCount",
-      "TxErrCount",
-      "CollisionCount",
-      "OverrunCount"
-    ],
-    "General Commissioning": [
-      "RegulatoryConfig",
-      "LocationCapability",
-      "BasicCommissioningInfo",
-      "SupportsConcurrentConnection"
-    ],
-    "General Diagnostics": [
-      "NetworkInterfaces",
-      "ActiveHardwareFaults",
-      "ActiveRadioFaults",
-      "ActiveNetworkFaults",
-      "RebootCount",
-      "UpTime",
-      "TotalOperationalHours",
-      "BootReason",
-      "FeatureMap",
-      "ClusterRevision"
-    ],
-    "Group Key Management": [
-      "ClusterRevision",
-      "MaxGroupsPerFabric",
-      "MaxGroupKeysPerFabric",
-      "FeatureMap"
-    ],
-    "ICD Management": [
-      "IdleModeDuration",
-      "ActiveModeDuration",
-      "ActiveModeThreshold",
-      "RegisteredClients",
-      "ICDCounter",
-      "ClientsSupportedPerFabric",
-      "MaximumCheckInBackOff"
-    ],
-    "Occupancy Sensing": [
-      "HoldTimeLimits",
-      "HoldTime",
-      "FeatureMap"
-    ],
-    "Operational Credentials": [
-      "SupportedFabrics",
-      "CommissionedFabrics",
-      "CurrentFabricIndex"
-    ],
-    "Software Diagnostics": [
-      "CurrentHeapFree",
-      "CurrentHeapHighWatermark",
-      "CurrentHeapUsed",
-      "FeatureMap",
-      "ThreadMetrics"
-    ],
-    "Unit Testing": [
-      "struct_attr",
-      "nullable_struct",
-      "general_error_boolean",
-      "cluster_error_boolean",
-      "global_struct",
-      "nullable_global_struct"
-    ],
-    "Thread Border Router Management": [
-      "BorderRouterName",
-      "BorderAgentID",
-      "ThreadVersion",
-      "InterfaceEnabled",
-      "ActiveDatasetTimestamp",
-      "PendingDatasetTimestamp",
-      "FeatureMap"
-    ],
-    "Thread Network Diagnostics": [
-      "Channel",
-      "RoutingRole",
-      "NetworkName",
-      "PanId",
-      "ExtendedPanId",
-      "MeshLocalPrefix",
-      "OverrunCount",
-      "PartitionId",
-      "Weighting",
-      "DataVersion",
-      "StableDataVersion",
-      "LeaderRouterId",
-      "DetachedRoleCount",
-      "ChildRoleCount",
-      "RouterRoleCount",
-      "LeaderRoleCount",
-      "AttachAttemptCount",
-      "PartitionIdChangeCount",
-      "BetterPartitionAttachAttemptCount",
-      "ParentChangeCount",
-      "TxTotalCount",
-      "TxUnicastCount",
-      "TxBroadcastCount",
-      "TxAckRequestedCount",
-      "TxAckedCount",
-      "TxNoAckRequestedCount",
-      "TxDataCount",
-      "TxDataPollCount",
-      "TxBeaconCount",
-      "TxBeaconRequestCount",
-      "TxOtherCount",
-      "TxRetryCount",
-      "TxDirectMaxRetryExpiryCount",
-      "TxIndirectMaxRetryExpiryCount",
-      "TxErrCcaCount",
-      "TxErrAbortCount",
-      "TxErrBusyChannelCount",
-      "RxTotalCount",
-      "RxUnicastCount",
-      "RxBroadcastCount",
-      "RxDataCount",
-      "RxDataPollCount",
-      "RxBeaconCount",
-      "RxBeaconRequestCount",
-      "RxOtherCount",
-      "RxAddressFilteredCount",
-      "RxDestAddrFilteredCount",
-      "RxDuplicatedCount",
-      "RxErrNoFrameCount",
-      "RxErrUnknownNeighborCount",
-      "RxErrInvalidSrcAddrCount",
-      "RxErrSecCount",
-      "RxErrFcsCount",
-      "RxErrOtherCount",
-      "ActiveTimestamp",
-      "PendingTimestamp",
-      "Delay",
-      "SecurityPolicy",
-      "ChannelPage0Mask",
-      "OperationalDatasetComponents"
-    ],
-    "Wi-Fi Network Diagnostics": [
-      "BSSID",
-      "SecurityType",
-      "WiFiVersion",
-      "ChannelNumber",
-      "RSSI",
-      "BeaconLostCount",
-      "BeaconRxCount",
-      "PacketMulticastRxCount",
-      "PacketMulticastTxCount",
-      "PacketUnicastRxCount",
-      "PacketUnicastTxCount",
-      "CurrentMaxRate",
-      "OverrunCount"
-    ],
-    "Channel": [
-      "Lineup",
-      "CurrentChannel"
-    ],
-    "Media Playback": [
-      "SampledPosition",
-      "ActiveAudioTrack",
-      "ActiveTextTrack"
-    ],
-    "Application Launcher": [
-      "CurrentApp"
-    ],
-    "Application Basic": [
-      "Application"
-    ],
-    "Time Synchronization": [
-      "TrustedTimeSource",
-      "DefaultNTP",
-      "TimeZone",
-      "DSTOffset",
-      "UTCTime",
-      "LocalTime",
-      "Granularity",
-      "TimeZoneListMaxSize",
-      "DSTOffsetListMaxSize"
-    ],
-    "Temperature Control": [
-      "SupportedTemperatureLevels"
-    ],
-    "Dishwasher Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "StartUpMode",
-      "OnMode",
-      "FeatureMap"
-    ],
-    "Microwave Oven Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "FeatureMap"
-    ],
-    "Microwave Oven Control": [
-      "CookTime",
-      "MaxCookTime",
-      "PowerSetting",
-      "MinPower",
-      "MaxPower",
-      "PowerStep",
-      "SupportedWatts",
-      "SelectedWattIndex",
-      "WattRating",
-      "FeatureMap"
-    ],
-    "Laundry Washer Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "StartUpMode",
-      "OnMode",
-      "FeatureMap"
-    ],
-    "Refrigerator And Temperature Controlled Cabinet Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "StartUpMode",
-      "OnMode",
-      "FeatureMap"
-    ],
-    "RVC Clean Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "FeatureMap"
-    ],
-    "RVC Run Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "FeatureMap"
-    ],
-    "Operational State": [
-      "OperationalState",
-      "OperationalError",
-      "CurrentPhase",
-      "CountdownTime"
-    ],
-    "RVC Operational State": [
-      "OperationalState",
-      "OperationalError",
-      "CurrentPhase",
-      "CountdownTime"
-    ],
-    "Oven Cavity Operational State": [
-      "OperationalState",
-      "OperationalError",
-      "CurrentPhase",
-      "CountdownTime"
-    ],
-    "Activated Carbon Filter Monitoring": [
-      "Condition",
-      "DegradationDirection",
-      "ChangeIndication",
-      "InPlaceIndicator",
-      "LastChangedTime",
-      "ReplacementProductList",
-      "FeatureMap"
-    ],
-    "HEPA Filter Monitoring": [
-      "Condition",
-      "DegradationDirection",
-      "ChangeIndication",
-      "InPlaceIndicator",
-      "LastChangedTime",
-      "ReplacementProductList",
-      "FeatureMap"
-    ],
-    "Carbon Monoxide Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "Carbon Dioxide Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "Nitrogen Dioxide Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "Ozone Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "PM2.5 Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "Formaldehyde Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "PM1 Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "PM10 Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "Total Volatile Organic Compounds Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "Radon Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "Air Quality": [
-      "AirQuality",
-      "FeatureMap"
-    ],
-    "Electrical Energy Measurement": [
-      "Accuracy",
-      "CumulativeEnergyImported",
-      "CumulativeEnergyExported",
-      "PeriodicEnergyImported",
-      "PeriodicEnergyExported",
-      "CumulativeEnergyReset",
-      "FeatureMap"
-    ],
-    "Electrical Power Measurement": [
-      "PowerMode",
-      "NumberOfMeasurementTypes",
-      "Accuracy",
-      "Ranges",
-      "Voltage",
-      "ActiveCurrent",
-      "ReactiveCurrent",
-      "ApparentCurrent",
-      "ActivePower",
-      "ReactivePower",
-      "ApparentPower",
-      "RMSVoltage",
-      "RMSCurrent",
-      "RMSPower",
-      "Frequency",
-      "HarmonicCurrents",
-      "HarmonicPhases",
-      "PowerFactor",
-      "NeutralCurrent",
-      "FeatureMap"
-    ],
-    "Power Topology": [
-      "FeatureMap"
-    ],
-    "Valve Configuration and Control": [
-      "RemainingDuration"
-    ],
-    "Boolean State Configuration": [
-      "CurrentSensitivityLevel"
-    ],
-    "Water Heater Management": [
-      "HeaterTypes",
-      "HeatDemand",
-      "TankVolume",
-      "EstimatedHeatRequired",
-      "TankPercentage",
-      "BoostState",
-      "FeatureMap",
-      "ClusterRevision"
-    ],
-    "Water Heater Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "FeatureMap"
-    ],
-    "Wi-Fi Network Management": [
-      "SSID",
-      "PassphraseSurrogate"
-    ],
-    "Thread Network Directory": [
-      "PreferredExtendedPanID",
-      "ThreadNetworks",
-      "ThreadNetworkTableSize"
-    ],
-    "Service Area": [
-      "CurrentArea",
-      "EstimatedEndTime",
-      "FeatureMap"
-    ]
-  },
-  "defaultReportingPolicy": "mandatory",
-  "ZCLDataTypes": [
-    "ARRAY",
-    "BITMAP",
-    "ENUM",
-    "NUMBER",
-    "STRING",
-    "STRUCT"
-  ],
-  "fabricHandling": {
-    "automaticallyCreateFields": true,
-    "indexFieldId": 254,
-    "indexFieldName": "FabricIndex",
-    "indexType": "fabric_idx"
-  },
-  "uiOptions": {
-    "showProfileId": false
-  }
 }
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index 0ac946aba3f2e9..db4526e39cbbde 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -1,760 +1,689 @@
 {
-  "description": "Matter SDK ZCL data",
-  "category": "matter",
-  "version": 1,
-  "requiredFeatureLevel": 102,
-  "xmlRoot": [
-    ".",
-    "./data-model/chip/",
-    "./data-model/silabs/"
-  ],
-  "_comment": "Ensure access-control-definitions.xml is first in xmlFile array",
-  "xmlFile": [
-    "access-control-definitions.xml",
-    "chip-types.xml",
-    "access-control-cluster.xml",
-    "account-login-cluster.xml",
-    "administrator-commissioning-cluster.xml",
-    "air-quality-cluster.xml",
-    "application-basic-cluster.xml",
-    "application-launcher-cluster.xml",
-    "audio-output-cluster.xml",
-    "ballast-configuration-cluster.xml",
-    "basic-information-cluster.xml",
-    "binding-cluster.xml",
-    "boolean-state-cluster.xml",
-    "boolean-state-configuration-cluster.xml",
-    "actions-cluster.xml",
-    "bridged-device-basic-information.xml",
-    "chip-ota.xml",
-    "channel-cluster.xml",
-    "clusters-extensions.xml",
-    "color-control-cluster.xml",
-    "commissioner-control-cluster.xml",
-    "concentration-measurement-cluster.xml",
-    "content-launch-cluster.xml",
-    "content-app-observer-cluster.xml",
-    "content-control-cluster.xml",
-    "descriptor-cluster.xml",
-    "device-energy-management-cluster.xml",
-    "device-energy-management-mode-cluster.xml",
-    "diagnostic-logs-cluster.xml",
-    "dishwasher-alarm-cluster.xml",
-    "dishwasher-mode-cluster.xml",
-    "microwave-oven-mode-cluster.xml",
-    "door-lock-cluster.xml",
-    "drlc-cluster.xml",
-    "ecosystem-information-cluster.xml",
-    "electrical-energy-measurement-cluster.xml",
-    "electrical-power-measurement-cluster.xml",
-    "energy-evse-cluster.xml",
-    "energy-evse-mode-cluster.xml",
-    "energy-preference-cluster.xml",
-    "ethernet-network-diagnostics-cluster.xml",
-    "fan-control-cluster.xml",
-    "fault-injection-cluster.xml",
-    "fixed-label-cluster.xml",
-    "flow-measurement-cluster.xml",
-    "general-commissioning-cluster.xml",
-    "general-diagnostics-cluster.xml",
-    "global-attributes.xml",
-    "global-bitmaps.xml",
-    "global-enums.xml",
-    "global-structs.xml",
-    "groups-cluster.xml",
-    "group-key-mgmt-cluster.xml",
-    "icd-management-cluster.xml",
-    "identify-cluster.xml",
-    "illuminance-measurement-cluster.xml",
-    "keypad-input-cluster.xml",
-    "laundry-washer-mode-cluster.xml",
-    "laundry-dryer-controls-cluster.xml",
-    "level-control-cluster.xml",
-    "localization-configuration-cluster.xml",
-    "low-power-cluster.xml",
-    "measurement-and-sensing.xml",
-    "media-input-cluster.xml",
-    "media-playback-cluster.xml",
-    "messages-cluster.xml",
-    "mode-base-cluster.xml",
-    "mode-select-cluster.xml",
-    "semantic-tag-namespace-enums.xml",
-    "network-commissioning-cluster.xml",
-    "occupancy-sensing-cluster.xml",
-    "onoff-cluster.xml",
-    "operational-credentials-cluster.xml",
-    "operational-state-cluster.xml",
-    "operational-state-oven-cluster.xml",
-    "operational-state-rvc-cluster.xml",
-    "oven-mode-cluster.xml",
-    "power-topology-cluster.xml",
-    "pressure-measurement-cluster.xml",
-    "power-source-cluster.xml",
-    "power-source-configuration-cluster.xml",
-    "proxy-configuration-cluster.xml",
-    "proxy-discovery-cluster.xml",
-    "proxy-valid-cluster.xml",
-    "pump-configuration-and-control-cluster.xml",
-    "pwm-cluster.xml",
-    "refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml",
-    "refrigerator-alarm.xml",
-    "relative-humidity-measurement-cluster.xml",
-    "rvc-clean-mode-cluster.xml ",
-    "rvc-run-mode-cluster.xml",
-    "replacable-monitoring-cluster.xml",
-    "resource-monitoring-cluster.xml",
-    "scene.xml",
-    "service-area-cluster.xml",
-    "smoke-co-alarm-cluster.xml",
-    "software-diagnostics-cluster.xml",
-    "switch-cluster.xml",
-    "target-navigator-cluster.xml",
-    "temperature-control-cluster.xml",
-    "microwave-oven-control-cluster.xml",
-    "temperature-measurement-cluster.xml",
-    "test-cluster.xml",
-    "thermostat-cluster.xml",
-    "thermostat-user-interface-configuration-cluster.xml",
-    "thread-border-router-management-cluster.xml",
-    "thread-network-diagnostics-cluster.xml",
-    "thread-network-directory-cluster.xml",
-    "time-format-localization-cluster.xml",
-    "time-synchronization-cluster.xml",
-    "timer-cluster.xml",
-    "user-label-cluster.xml",
-    "unit-localization-cluster.xml",
-    "valve-configuration-and-control-cluster.xml",
-    "wake-on-lan-cluster.xml",
-    "washer-controls-cluster.xml",
-    "water-heater-management-cluster.xml",
-    "water-heater-mode-cluster.xml",
-    "wifi-network-diagnostics-cluster.xml",
-    "wifi-network-management-cluster.xml",
-    "window-covering.xml",
-    "matter-devices.xml",
-    "sample-mei-cluster.xml",
-    "types/door-lock.xml",
-    "types/occupancy-sensing.xml",
-    "types/thermostat-user-interface-configuration.xml"
-  ],
-  "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
-  "options": {
-    "text": {
-      "defaultResponsePolicy": [
-        "Always",
-        "Conditional",
-        "Never"
-      ]
+    "description": "Matter SDK ZCL data",
+    "category": "matter",
+    "version": 1,
+    "requiredFeatureLevel": 102,
+    "xmlRoot": [".", "./data-model/chip/", "./data-model/silabs/"],
+    "_comment": "Ensure access-control-definitions.xml is first in xmlFile array",
+    "xmlFile": [
+        "access-control-definitions.xml",
+        "chip-types.xml",
+        "access-control-cluster.xml",
+        "account-login-cluster.xml",
+        "administrator-commissioning-cluster.xml",
+        "air-quality-cluster.xml",
+        "application-basic-cluster.xml",
+        "application-launcher-cluster.xml",
+        "audio-output-cluster.xml",
+        "ballast-configuration-cluster.xml",
+        "basic-information-cluster.xml",
+        "binding-cluster.xml",
+        "boolean-state-cluster.xml",
+        "boolean-state-configuration-cluster.xml",
+        "actions-cluster.xml",
+        "bridged-device-basic-information.xml",
+        "chip-ota.xml",
+        "channel-cluster.xml",
+        "clusters-extensions.xml",
+        "color-control-cluster.xml",
+        "commissioner-control-cluster.xml",
+        "concentration-measurement-cluster.xml",
+        "content-launch-cluster.xml",
+        "content-app-observer-cluster.xml",
+        "content-control-cluster.xml",
+        "descriptor-cluster.xml",
+        "device-energy-management-cluster.xml",
+        "device-energy-management-mode-cluster.xml",
+        "diagnostic-logs-cluster.xml",
+        "dishwasher-alarm-cluster.xml",
+        "dishwasher-mode-cluster.xml",
+        "microwave-oven-mode-cluster.xml",
+        "door-lock-cluster.xml",
+        "drlc-cluster.xml",
+        "ecosystem-information-cluster.xml",
+        "electrical-energy-measurement-cluster.xml",
+        "electrical-power-measurement-cluster.xml",
+        "energy-evse-cluster.xml",
+        "energy-evse-mode-cluster.xml",
+        "energy-preference-cluster.xml",
+        "ethernet-network-diagnostics-cluster.xml",
+        "fan-control-cluster.xml",
+        "fault-injection-cluster.xml",
+        "fixed-label-cluster.xml",
+        "flow-measurement-cluster.xml",
+        "general-commissioning-cluster.xml",
+        "general-diagnostics-cluster.xml",
+        "global-attributes.xml",
+        "global-bitmaps.xml",
+        "global-enums.xml",
+        "global-structs.xml",
+        "groups-cluster.xml",
+        "group-key-mgmt-cluster.xml",
+        "icd-management-cluster.xml",
+        "identify-cluster.xml",
+        "illuminance-measurement-cluster.xml",
+        "keypad-input-cluster.xml",
+        "laundry-washer-mode-cluster.xml",
+        "laundry-dryer-controls-cluster.xml",
+        "level-control-cluster.xml",
+        "localization-configuration-cluster.xml",
+        "low-power-cluster.xml",
+        "measurement-and-sensing.xml",
+        "media-input-cluster.xml",
+        "media-playback-cluster.xml",
+        "messages-cluster.xml",
+        "mode-base-cluster.xml",
+        "mode-select-cluster.xml",
+        "semantic-tag-namespace-enums.xml",
+        "network-commissioning-cluster.xml",
+        "occupancy-sensing-cluster.xml",
+        "onoff-cluster.xml",
+        "operational-credentials-cluster.xml",
+        "operational-state-cluster.xml",
+        "operational-state-oven-cluster.xml",
+        "operational-state-rvc-cluster.xml",
+        "oven-mode-cluster.xml",
+        "power-topology-cluster.xml",
+        "pressure-measurement-cluster.xml",
+        "power-source-cluster.xml",
+        "power-source-configuration-cluster.xml",
+        "proxy-configuration-cluster.xml",
+        "proxy-discovery-cluster.xml",
+        "proxy-valid-cluster.xml",
+        "pump-configuration-and-control-cluster.xml",
+        "pwm-cluster.xml",
+        "refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml",
+        "refrigerator-alarm.xml",
+        "relative-humidity-measurement-cluster.xml",
+        "rvc-clean-mode-cluster.xml ",
+        "rvc-run-mode-cluster.xml",
+        "replacable-monitoring-cluster.xml",
+        "resource-monitoring-cluster.xml",
+        "scene.xml",
+        "service-area-cluster.xml",
+        "smoke-co-alarm-cluster.xml",
+        "software-diagnostics-cluster.xml",
+        "switch-cluster.xml",
+        "target-navigator-cluster.xml",
+        "temperature-control-cluster.xml",
+        "microwave-oven-control-cluster.xml",
+        "temperature-measurement-cluster.xml",
+        "test-cluster.xml",
+        "thermostat-cluster.xml",
+        "thermostat-user-interface-configuration-cluster.xml",
+        "thread-border-router-management-cluster.xml",
+        "thread-network-diagnostics-cluster.xml",
+        "thread-network-directory-cluster.xml",
+        "time-format-localization-cluster.xml",
+        "time-synchronization-cluster.xml",
+        "timer-cluster.xml",
+        "user-label-cluster.xml",
+        "unit-localization-cluster.xml",
+        "valve-configuration-and-control-cluster.xml",
+        "wake-on-lan-cluster.xml",
+        "washer-controls-cluster.xml",
+        "water-heater-management-cluster.xml",
+        "water-heater-mode-cluster.xml",
+        "wifi-network-diagnostics-cluster.xml",
+        "wifi-network-management-cluster.xml",
+        "window-covering.xml",
+        "matter-devices.xml",
+        "sample-mei-cluster.xml",
+        "types/door-lock.xml",
+        "types/occupancy-sensing.xml",
+        "types/thermostat-user-interface-configuration.xml"
+    ],
+    "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
+    "options": {
+        "text": {
+            "defaultResponsePolicy": ["Always", "Conditional", "Never"]
+        },
+        "bool": ["commandDiscovery"]
     },
-    "bool": [
-      "commandDiscovery"
-    ]
-  },
-  "defaults": {
-    "text": {
-      "manufacturerCodes": "0x1002",
-      "defaultResponsePolicy": "always"
+    "defaults": {
+        "text": {
+            "manufacturerCodes": "0x1002",
+            "defaultResponsePolicy": "always"
+        },
+        "bool": {
+            "commandDiscovery": true
+        }
     },
-    "bool": {
-      "commandDiscovery": true
+    "listsUseAttributeAccessInterface": true,
+    "attributeAccessInterfaceAttributes": {
+        "Access Control": [
+            "ClusterRevision",
+            "SubjectsPerAccessControlEntry",
+            "TargetsPerAccessControlEntry",
+            "AccessControlEntriesPerFabric"
+        ],
+        "Administrator Commissioning": [
+            "WindowStatus",
+            "AdminFabricIndex",
+            "AdminVendorId"
+        ],
+        "Basic Information": [
+            "DataModelRevision",
+            "VendorName",
+            "VendorID",
+            "ProductName",
+            "ProductID",
+            "Location",
+            "HardwareVersion",
+            "HardwareVersionString",
+            "SoftwareVersion",
+            "SoftwareVersionString",
+            "ManufacturingDate",
+            "PartNumber",
+            "ProductURL",
+            "ProductLabel",
+            "SerialNumber",
+            "UniqueID",
+            "CapabilityMinima",
+            "ProductAppearance",
+            "SpecificationVersion",
+            "MaxPathsPerInvoke"
+        ],
+        "Bridged Device Basic Information": ["ProductAppearance"],
+        "Descriptor": ["ClusterRevision", "FeatureMap"],
+        "Device Energy Management": [
+            "ESAType",
+            "ESACanGenerate",
+            "ESAState",
+            "AbsMinPower",
+            "AbsMaxPower",
+            "PowerAdjustmentCapability",
+            "Forecast",
+            "OptOutState",
+            "FeatureMap"
+        ],
+        "Device Energy Management Mode": [
+            "SupportedModes",
+            "CurrentMode",
+            "FeatureMap"
+        ],
+        "Door Lock": [
+            "AliroReaderVerificationKey",
+            "AliroReaderGroupIdentifier",
+            "AliroReaderGroupSubIdentifier",
+            "AliroGroupResolvingKey",
+            "AliroBLEAdvertisingVersion",
+            "NumberOfAliroCredentialIssuerKeysSupported",
+            "NumberOfAliroEndpointKeysSupported"
+        ],
+        "Energy EVSE": [
+            "State",
+            "SupplyState",
+            "FaultState",
+            "ChargingEnabledUntil",
+            "DischargingEnabledUntil",
+            "CircuitCapacity",
+            "MinimumChargeCurrent",
+            "MaximumChargeCurrent",
+            "MaximumDischargeCurrent",
+            "UserMaximumChargeCurrent",
+            "RandomizationDelayWindow",
+            "NextChargeStartTime",
+            "NextChargeTargetTime",
+            "NextChargeRequiredEnergy",
+            "NextChargeTargetSoC",
+            "ApproximateEVEfficiency",
+            "StateOfCharge",
+            "BatteryCapacity",
+            "VehicleID",
+            "SessionID",
+            "SessionDuration",
+            "SessionEnergyCharged",
+            "SessionEnergyDischarged",
+            "FeatureMap"
+        ],
+        "Energy EVSE Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
+        "Ethernet Network Diagnostics": [
+            "PHYRate",
+            "FullDuplex",
+            "CarrierDetect",
+            "TimeSinceReset",
+            "PacketRxCount",
+            "PacketTxCount",
+            "TxErrCount",
+            "CollisionCount",
+            "OverrunCount"
+        ],
+        "General Commissioning": [
+            "RegulatoryConfig",
+            "LocationCapability",
+            "BasicCommissioningInfo",
+            "SupportsConcurrentConnection"
+        ],
+        "General Diagnostics": [
+            "NetworkInterfaces",
+            "ActiveHardwareFaults",
+            "ActiveRadioFaults",
+            "ActiveNetworkFaults",
+            "RebootCount",
+            "UpTime",
+            "TotalOperationalHours",
+            "BootReason",
+            "FeatureMap",
+            "ClusterRevision"
+        ],
+        "Group Key Management": [
+            "ClusterRevision",
+            "MaxGroupsPerFabric",
+            "MaxGroupKeysPerFabric",
+            "FeatureMap"
+        ],
+        "ICD Management": [
+            "IdleModeDuration",
+            "ActiveModeDuration",
+            "ActiveModeThreshold",
+            "RegisteredClients",
+            "ICDCounter",
+            "ClientsSupportedPerFabric",
+            "MaximumCheckInBackOff"
+        ],
+        "Occupancy Sensing": ["HoldTimeLimits", "HoldTime", "FeatureMap"],
+        "Operational Credentials": [
+            "SupportedFabrics",
+            "CommissionedFabrics",
+            "CurrentFabricIndex"
+        ],
+        "Software Diagnostics": [
+            "CurrentHeapFree",
+            "CurrentHeapHighWatermark",
+            "CurrentHeapUsed",
+            "FeatureMap",
+            "ThreadMetrics"
+        ],
+        "Unit Testing": [
+            "struct_attr",
+            "nullable_struct",
+            "general_error_boolean",
+            "cluster_error_boolean",
+            "global_struct",
+            "nullable_global_struct"
+        ],
+        "Thread Border Router Management": [
+            "BorderRouterName",
+            "BorderAgentID",
+            "ThreadVersion",
+            "InterfaceEnabled",
+            "ActiveDatasetTimestamp",
+            "PendingDatasetTimestamp",
+            "FeatureMap"
+        ],
+        "Thread Network Diagnostics": [
+            "Channel",
+            "RoutingRole",
+            "NetworkName",
+            "PanId",
+            "ExtendedPanId",
+            "MeshLocalPrefix",
+            "OverrunCount",
+            "PartitionId",
+            "Weighting",
+            "DataVersion",
+            "StableDataVersion",
+            "LeaderRouterId",
+            "DetachedRoleCount",
+            "ChildRoleCount",
+            "RouterRoleCount",
+            "LeaderRoleCount",
+            "AttachAttemptCount",
+            "PartitionIdChangeCount",
+            "BetterPartitionAttachAttemptCount",
+            "ParentChangeCount",
+            "TxTotalCount",
+            "TxUnicastCount",
+            "TxBroadcastCount",
+            "TxAckRequestedCount",
+            "TxAckedCount",
+            "TxNoAckRequestedCount",
+            "TxDataCount",
+            "TxDataPollCount",
+            "TxBeaconCount",
+            "TxBeaconRequestCount",
+            "TxOtherCount",
+            "TxRetryCount",
+            "TxDirectMaxRetryExpiryCount",
+            "TxIndirectMaxRetryExpiryCount",
+            "TxErrCcaCount",
+            "TxErrAbortCount",
+            "TxErrBusyChannelCount",
+            "RxTotalCount",
+            "RxUnicastCount",
+            "RxBroadcastCount",
+            "RxDataCount",
+            "RxDataPollCount",
+            "RxBeaconCount",
+            "RxBeaconRequestCount",
+            "RxOtherCount",
+            "RxAddressFilteredCount",
+            "RxDestAddrFilteredCount",
+            "RxDuplicatedCount",
+            "RxErrNoFrameCount",
+            "RxErrUnknownNeighborCount",
+            "RxErrInvalidSrcAddrCount",
+            "RxErrSecCount",
+            "RxErrFcsCount",
+            "RxErrOtherCount",
+            "ActiveTimestamp",
+            "PendingTimestamp",
+            "Delay",
+            "SecurityPolicy",
+            "ChannelPage0Mask",
+            "OperationalDatasetComponents"
+        ],
+        "Wi-Fi Network Diagnostics": [
+            "BSSID",
+            "SecurityType",
+            "WiFiVersion",
+            "ChannelNumber",
+            "RSSI",
+            "BeaconLostCount",
+            "BeaconRxCount",
+            "PacketMulticastRxCount",
+            "PacketMulticastTxCount",
+            "PacketUnicastRxCount",
+            "PacketUnicastTxCount",
+            "CurrentMaxRate",
+            "OverrunCount"
+        ],
+        "Channel": ["Lineup", "CurrentChannel"],
+        "Media Playback": [
+            "SampledPosition",
+            "ActiveAudioTrack",
+            "ActiveTextTrack"
+        ],
+        "Application Launcher": ["CurrentApp"],
+        "Application Basic": ["Application"],
+        "Time Synchronization": [
+            "TrustedTimeSource",
+            "DefaultNTP",
+            "TimeZone",
+            "DSTOffset",
+            "UTCTime",
+            "LocalTime",
+            "Granularity",
+            "TimeZoneListMaxSize",
+            "DSTOffsetListMaxSize"
+        ],
+        "Temperature Control": ["SupportedTemperatureLevels"],
+        "Dishwasher Mode": [
+            "SupportedModes",
+            "CurrentMode",
+            "StartUpMode",
+            "OnMode",
+            "FeatureMap"
+        ],
+        "Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
+        "Microwave Oven Control": [
+            "CookTime",
+            "MaxCookTime",
+            "PowerSetting",
+            "MinPower",
+            "MaxPower",
+            "PowerStep",
+            "SupportedWatts",
+            "SelectedWattIndex",
+            "WattRating",
+            "FeatureMap"
+        ],
+        "Laundry Washer Mode": [
+            "SupportedModes",
+            "CurrentMode",
+            "StartUpMode",
+            "OnMode",
+            "FeatureMap"
+        ],
+        "Refrigerator And Temperature Controlled Cabinet Mode": [
+            "SupportedModes",
+            "CurrentMode",
+            "StartUpMode",
+            "OnMode",
+            "FeatureMap"
+        ],
+        "RVC Clean Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
+        "RVC Run Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
+        "Operational State": [
+            "OperationalState",
+            "OperationalError",
+            "CurrentPhase",
+            "CountdownTime"
+        ],
+        "RVC Operational State": [
+            "OperationalState",
+            "OperationalError",
+            "CurrentPhase",
+            "CountdownTime"
+        ],
+        "Oven Cavity Operational State": [
+            "OperationalState",
+            "OperationalError",
+            "CurrentPhase",
+            "CountdownTime"
+        ],
+        "Activated Carbon Filter Monitoring": [
+            "Condition",
+            "DegradationDirection",
+            "ChangeIndication",
+            "InPlaceIndicator",
+            "LastChangedTime",
+            "ReplacementProductList",
+            "FeatureMap"
+        ],
+        "HEPA Filter Monitoring": [
+            "Condition",
+            "DegradationDirection",
+            "ChangeIndication",
+            "InPlaceIndicator",
+            "LastChangedTime",
+            "ReplacementProductList",
+            "FeatureMap"
+        ],
+        "Carbon Monoxide Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "Carbon Dioxide Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "Nitrogen Dioxide Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "Ozone Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "PM2.5 Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "Formaldehyde Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "PM1 Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "PM10 Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "Total Volatile Organic Compounds Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "Radon Concentration Measurement": [
+            "MeasuredValue",
+            "MinMeasuredValue",
+            "MaxMeasuredValue",
+            "PeakMeasuredValue",
+            "PeakMeasuredValueWindow",
+            "AverageMeasuredValue",
+            "AverageMeasuredValueWindow",
+            "Uncertainty",
+            "MeasurementUnit",
+            "MeasurementMedium",
+            "LevelValue",
+            "FeatureMap"
+        ],
+        "Air Quality": ["AirQuality", "FeatureMap"],
+        "Electrical Energy Measurement": [
+            "Accuracy",
+            "CumulativeEnergyImported",
+            "CumulativeEnergyExported",
+            "PeriodicEnergyImported",
+            "PeriodicEnergyExported",
+            "CumulativeEnergyReset",
+            "FeatureMap"
+        ],
+        "Electrical Power Measurement": [
+            "PowerMode",
+            "NumberOfMeasurementTypes",
+            "Accuracy",
+            "Ranges",
+            "Voltage",
+            "ActiveCurrent",
+            "ReactiveCurrent",
+            "ApparentCurrent",
+            "ActivePower",
+            "ReactivePower",
+            "ApparentPower",
+            "RMSVoltage",
+            "RMSCurrent",
+            "RMSPower",
+            "Frequency",
+            "HarmonicCurrents",
+            "HarmonicPhases",
+            "PowerFactor",
+            "NeutralCurrent",
+            "FeatureMap"
+        ],
+        "Power Topology": ["FeatureMap"],
+        "Valve Configuration and Control": ["RemainingDuration"],
+        "Boolean State Configuration": ["CurrentSensitivityLevel"],
+        "Water Heater Management": [
+            "HeaterTypes",
+            "HeatDemand",
+            "TankVolume",
+            "EstimatedHeatRequired",
+            "TankPercentage",
+            "BoostState",
+            "FeatureMap",
+            "ClusterRevision"
+        ],
+        "Water Heater Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
+        "Wi-Fi Network Management": ["SSID", "PassphraseSurrogate"],
+        "Thread Network Directory": [
+            "PreferredExtendedPanID",
+            "ThreadNetworks",
+            "ThreadNetworkTableSize"
+        ],
+        "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
+    },
+    "defaultReportingPolicy": "mandatory",
+    "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],
+    "fabricHandling": {
+        "automaticallyCreateFields": true,
+        "indexFieldId": 254,
+        "indexFieldName": "FabricIndex",
+        "indexType": "fabric_idx"
+    },
+    "uiOptions": {
+        "showProfileId": false
     }
-  },
-  "listsUseAttributeAccessInterface": true,
-  "attributeAccessInterfaceAttributes": {
-    "Access Control": [
-      "ClusterRevision",
-      "SubjectsPerAccessControlEntry",
-      "TargetsPerAccessControlEntry",
-      "AccessControlEntriesPerFabric"
-    ],
-    "Administrator Commissioning": [
-      "WindowStatus",
-      "AdminFabricIndex",
-      "AdminVendorId"
-    ],
-    "Basic Information": [
-      "DataModelRevision",
-      "VendorName",
-      "VendorID",
-      "ProductName",
-      "ProductID",
-      "Location",
-      "HardwareVersion",
-      "HardwareVersionString",
-      "SoftwareVersion",
-      "SoftwareVersionString",
-      "ManufacturingDate",
-      "PartNumber",
-      "ProductURL",
-      "ProductLabel",
-      "SerialNumber",
-      "UniqueID",
-      "CapabilityMinima",
-      "ProductAppearance",
-      "SpecificationVersion",
-      "MaxPathsPerInvoke"
-    ],
-    "Bridged Device Basic Information": [
-      "ProductAppearance"
-    ],
-    "Descriptor": [
-      "ClusterRevision",
-      "FeatureMap"
-    ],
-    "Device Energy Management": [
-      "ESAType",
-      "ESACanGenerate",
-      "ESAState",
-      "AbsMinPower",
-      "AbsMaxPower",
-      "PowerAdjustmentCapability",
-      "Forecast",
-      "OptOutState",
-      "FeatureMap"
-    ],
-    "Device Energy Management Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "FeatureMap"
-    ],
-    "Door Lock": [
-      "AliroReaderVerificationKey",
-      "AliroReaderGroupIdentifier",
-      "AliroReaderGroupSubIdentifier",
-      "AliroGroupResolvingKey",
-      "AliroBLEAdvertisingVersion",
-      "NumberOfAliroCredentialIssuerKeysSupported",
-      "NumberOfAliroEndpointKeysSupported"
-    ],
-    "Energy EVSE": [
-      "State",
-      "SupplyState",
-      "FaultState",
-      "ChargingEnabledUntil",
-      "DischargingEnabledUntil",
-      "CircuitCapacity",
-      "MinimumChargeCurrent",
-      "MaximumChargeCurrent",
-      "MaximumDischargeCurrent",
-      "UserMaximumChargeCurrent",
-      "RandomizationDelayWindow",
-      "NextChargeStartTime",
-      "NextChargeTargetTime",
-      "NextChargeRequiredEnergy",
-      "NextChargeTargetSoC",
-      "ApproximateEVEfficiency",
-      "StateOfCharge",
-      "BatteryCapacity",
-      "VehicleID",
-      "SessionID",
-      "SessionDuration",
-      "SessionEnergyCharged",
-      "SessionEnergyDischarged",
-      "FeatureMap"
-    ],
-    "Energy EVSE Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "FeatureMap"
-    ],
-    "Ethernet Network Diagnostics": [
-      "PHYRate",
-      "FullDuplex",
-      "CarrierDetect",
-      "TimeSinceReset",
-      "PacketRxCount",
-      "PacketTxCount",
-      "TxErrCount",
-      "CollisionCount",
-      "OverrunCount"
-    ],
-    "General Commissioning": [
-      "RegulatoryConfig",
-      "LocationCapability",
-      "BasicCommissioningInfo",
-      "SupportsConcurrentConnection"
-    ],
-    "General Diagnostics": [
-      "NetworkInterfaces",
-      "ActiveHardwareFaults",
-      "ActiveRadioFaults",
-      "ActiveNetworkFaults",
-      "RebootCount",
-      "UpTime",
-      "TotalOperationalHours",
-      "BootReason",
-      "FeatureMap",
-      "ClusterRevision"
-    ],
-    "Group Key Management": [
-      "ClusterRevision",
-      "MaxGroupsPerFabric",
-      "MaxGroupKeysPerFabric",
-      "FeatureMap"
-    ],
-    "ICD Management": [
-      "IdleModeDuration",
-      "ActiveModeDuration",
-      "ActiveModeThreshold",
-      "RegisteredClients",
-      "ICDCounter",
-      "ClientsSupportedPerFabric",
-      "MaximumCheckInBackOff"
-    ],
-    "Occupancy Sensing": [
-      "HoldTimeLimits",
-      "HoldTime",
-      "FeatureMap"
-    ],
-    "Operational Credentials": [
-      "SupportedFabrics",
-      "CommissionedFabrics",
-      "CurrentFabricIndex"
-    ],
-    "Software Diagnostics": [
-      "CurrentHeapFree",
-      "CurrentHeapHighWatermark",
-      "CurrentHeapUsed",
-      "FeatureMap",
-      "ThreadMetrics"
-    ],
-    "Unit Testing": [
-      "struct_attr",
-      "nullable_struct",
-      "general_error_boolean",
-      "cluster_error_boolean",
-      "global_struct",
-      "nullable_global_struct"
-    ],
-    "Thread Border Router Management": [
-      "BorderRouterName",
-      "BorderAgentID",
-      "ThreadVersion",
-      "InterfaceEnabled",
-      "ActiveDatasetTimestamp",
-      "PendingDatasetTimestamp",
-      "FeatureMap"
-    ],
-    "Thread Network Diagnostics": [
-      "Channel",
-      "RoutingRole",
-      "NetworkName",
-      "PanId",
-      "ExtendedPanId",
-      "MeshLocalPrefix",
-      "OverrunCount",
-      "PartitionId",
-      "Weighting",
-      "DataVersion",
-      "StableDataVersion",
-      "LeaderRouterId",
-      "DetachedRoleCount",
-      "ChildRoleCount",
-      "RouterRoleCount",
-      "LeaderRoleCount",
-      "AttachAttemptCount",
-      "PartitionIdChangeCount",
-      "BetterPartitionAttachAttemptCount",
-      "ParentChangeCount",
-      "TxTotalCount",
-      "TxUnicastCount",
-      "TxBroadcastCount",
-      "TxAckRequestedCount",
-      "TxAckedCount",
-      "TxNoAckRequestedCount",
-      "TxDataCount",
-      "TxDataPollCount",
-      "TxBeaconCount",
-      "TxBeaconRequestCount",
-      "TxOtherCount",
-      "TxRetryCount",
-      "TxDirectMaxRetryExpiryCount",
-      "TxIndirectMaxRetryExpiryCount",
-      "TxErrCcaCount",
-      "TxErrAbortCount",
-      "TxErrBusyChannelCount",
-      "RxTotalCount",
-      "RxUnicastCount",
-      "RxBroadcastCount",
-      "RxDataCount",
-      "RxDataPollCount",
-      "RxBeaconCount",
-      "RxBeaconRequestCount",
-      "RxOtherCount",
-      "RxAddressFilteredCount",
-      "RxDestAddrFilteredCount",
-      "RxDuplicatedCount",
-      "RxErrNoFrameCount",
-      "RxErrUnknownNeighborCount",
-      "RxErrInvalidSrcAddrCount",
-      "RxErrSecCount",
-      "RxErrFcsCount",
-      "RxErrOtherCount",
-      "ActiveTimestamp",
-      "PendingTimestamp",
-      "Delay",
-      "SecurityPolicy",
-      "ChannelPage0Mask",
-      "OperationalDatasetComponents"
-    ],
-    "Wi-Fi Network Diagnostics": [
-      "BSSID",
-      "SecurityType",
-      "WiFiVersion",
-      "ChannelNumber",
-      "RSSI",
-      "BeaconLostCount",
-      "BeaconRxCount",
-      "PacketMulticastRxCount",
-      "PacketMulticastTxCount",
-      "PacketUnicastRxCount",
-      "PacketUnicastTxCount",
-      "CurrentMaxRate",
-      "OverrunCount"
-    ],
-    "Channel": [
-      "Lineup",
-      "CurrentChannel"
-    ],
-    "Media Playback": [
-      "SampledPosition",
-      "ActiveAudioTrack",
-      "ActiveTextTrack"
-    ],
-    "Application Launcher": [
-      "CurrentApp"
-    ],
-    "Application Basic": [
-      "Application"
-    ],
-    "Time Synchronization": [
-      "TrustedTimeSource",
-      "DefaultNTP",
-      "TimeZone",
-      "DSTOffset",
-      "UTCTime",
-      "LocalTime",
-      "Granularity",
-      "TimeZoneListMaxSize",
-      "DSTOffsetListMaxSize"
-    ],
-    "Temperature Control": [
-      "SupportedTemperatureLevels"
-    ],
-    "Dishwasher Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "StartUpMode",
-      "OnMode",
-      "FeatureMap"
-    ],
-    "Microwave Oven Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "FeatureMap"
-    ],
-    "Microwave Oven Control": [
-      "CookTime",
-      "MaxCookTime",
-      "PowerSetting",
-      "MinPower",
-      "MaxPower",
-      "PowerStep",
-      "SupportedWatts",
-      "SelectedWattIndex",
-      "WattRating",
-      "FeatureMap"
-    ],
-    "Laundry Washer Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "StartUpMode",
-      "OnMode",
-      "FeatureMap"
-    ],
-    "Refrigerator And Temperature Controlled Cabinet Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "StartUpMode",
-      "OnMode",
-      "FeatureMap"
-    ],
-    "RVC Clean Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "FeatureMap"
-    ],
-    "RVC Run Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "FeatureMap"
-    ],
-    "Operational State": [
-      "OperationalState",
-      "OperationalError",
-      "CurrentPhase",
-      "CountdownTime"
-    ],
-    "RVC Operational State": [
-      "OperationalState",
-      "OperationalError",
-      "CurrentPhase",
-      "CountdownTime"
-    ],
-    "Oven Cavity Operational State": [
-      "OperationalState",
-      "OperationalError",
-      "CurrentPhase",
-      "CountdownTime"
-    ],
-    "Activated Carbon Filter Monitoring": [
-      "Condition",
-      "DegradationDirection",
-      "ChangeIndication",
-      "InPlaceIndicator",
-      "LastChangedTime",
-      "ReplacementProductList",
-      "FeatureMap"
-    ],
-    "HEPA Filter Monitoring": [
-      "Condition",
-      "DegradationDirection",
-      "ChangeIndication",
-      "InPlaceIndicator",
-      "LastChangedTime",
-      "ReplacementProductList",
-      "FeatureMap"
-    ],
-    "Carbon Monoxide Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "Carbon Dioxide Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "Nitrogen Dioxide Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "Ozone Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "PM2.5 Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "Formaldehyde Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "PM1 Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "PM10 Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "Total Volatile Organic Compounds Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "Radon Concentration Measurement": [
-      "MeasuredValue",
-      "MinMeasuredValue",
-      "MaxMeasuredValue",
-      "PeakMeasuredValue",
-      "PeakMeasuredValueWindow",
-      "AverageMeasuredValue",
-      "AverageMeasuredValueWindow",
-      "Uncertainty",
-      "MeasurementUnit",
-      "MeasurementMedium",
-      "LevelValue",
-      "FeatureMap"
-    ],
-    "Air Quality": [
-      "AirQuality",
-      "FeatureMap"
-    ],
-    "Electrical Energy Measurement": [
-      "Accuracy",
-      "CumulativeEnergyImported",
-      "CumulativeEnergyExported",
-      "PeriodicEnergyImported",
-      "PeriodicEnergyExported",
-      "CumulativeEnergyReset",
-      "FeatureMap"
-    ],
-    "Electrical Power Measurement": [
-      "PowerMode",
-      "NumberOfMeasurementTypes",
-      "Accuracy",
-      "Ranges",
-      "Voltage",
-      "ActiveCurrent",
-      "ReactiveCurrent",
-      "ApparentCurrent",
-      "ActivePower",
-      "ReactivePower",
-      "ApparentPower",
-      "RMSVoltage",
-      "RMSCurrent",
-      "RMSPower",
-      "Frequency",
-      "HarmonicCurrents",
-      "HarmonicPhases",
-      "PowerFactor",
-      "NeutralCurrent",
-      "FeatureMap"
-    ],
-    "Power Topology": [
-      "FeatureMap"
-    ],
-    "Valve Configuration and Control": [
-      "RemainingDuration"
-    ],
-    "Boolean State Configuration": [
-      "CurrentSensitivityLevel"
-    ],
-    "Water Heater Management": [
-      "HeaterTypes",
-      "HeatDemand",
-      "TankVolume",
-      "EstimatedHeatRequired",
-      "TankPercentage",
-      "BoostState",
-      "FeatureMap",
-      "ClusterRevision"
-    ],
-    "Water Heater Mode": [
-      "SupportedModes",
-      "CurrentMode",
-      "FeatureMap"
-    ],
-    "Wi-Fi Network Management": [
-      "SSID",
-      "PassphraseSurrogate"
-    ],
-    "Thread Network Directory": [
-      "PreferredExtendedPanID",
-      "ThreadNetworks",
-      "ThreadNetworkTableSize"
-    ],
-    "Service Area": [
-      "CurrentArea",
-      "EstimatedEndTime",
-      "FeatureMap"
-    ]
-  },
-  "defaultReportingPolicy": "mandatory",
-  "ZCLDataTypes": [
-    "ARRAY",
-    "BITMAP",
-    "ENUM",
-    "NUMBER",
-    "STRING",
-    "STRUCT"
-  ],
-  "fabricHandling": {
-    "automaticallyCreateFields": true,
-    "indexFieldId": 254,
-    "indexFieldName": "FabricIndex",
-    "indexType": "fabric_idx"
-  },
-  "uiOptions": {
-    "showProfileId": false
-  }
 }
diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json
index c5ec18f8ca9a98..a047340147ece5 100644
--- a/src/app/zap_cluster_list.json
+++ b/src/app/zap_cluster_list.json
@@ -1,485 +1,317 @@
 {
-  "ClientDirectories": {
-    "ACCESS_CONTROL_CLUSTER": [],
-    "ACCOUNT_LOGIN_CLUSTER": [],
-    "ACTIONS_CLUSTER": [],
-    "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER": [],
-    "ADMINISTRATOR_COMMISSIONING_CLUSTER": [],
-    "AIR_QUALITY_CLUSTER": [],
-    "ALARM_CLUSTER": [],
-    "APPLICATION_BASIC_CLUSTER": [],
-    "APPLICATION_LAUNCHER_CLUSTER": [],
-    "AUDIO_OUTPUT_CLUSTER": [],
-    "BALLAST_CONFIGURATION_CLUSTER": [],
-    "BASIC_INFORMATION_CLUSTER": [],
-    "BINDING_CLUSTER": [],
-    "BOOLEAN_STATE_CLUSTER": [],
-    "BOOLEAN_STATE_CONFIGURATION_CLUSTER": [],
-    "BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [],
-    "CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-    "CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-    "CHANNEL_CLUSTER": [],
-    "CLIENT_MONITORING_CLUSTER": [],
-    "COLOR_CONTROL_CLUSTER": [],
-    "COMMISSIONER_CONTROL_CLUSTER": [],
-    "COMMISSIONING_CLUSTER": [],
-    "CONTENT_LAUNCHER_CLUSTER": [],
-    "CONTENT_CONTROL_CLUSTER": [],
-    "CONTENT_APP_OBSERVER_CLUSTER": [],
-    "DESCRIPTOR_CLUSTER": [],
-    "DEVICE_ENERGY_MANAGEMENT_CLUSTER": [],
-    "DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER": [],
-    "DEVICE_TEMP_CLUSTER": [],
-    "DIAGNOSTIC_LOGS_CLUSTER": [],
-    "DISHWASHER_ALARM_CLUSTER": [],
-    "DISHWASHER_MODE_CLUSTER": [],
-    "MICROWAVE_OVEN_MODE_CLUSTER": [],
-    "DOOR_LOCK_CLUSTER": [],
-    "ECOSYSTEM_INFORMATION_CLUSTER": [],
-    "ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER": [],
-    "ELECTRICAL_POWER_MEASUREMENT_CLUSTER": [],
-    "ENERGY_EVSE_CLUSTER": [],
-    "ENERGY_EVSE_MODE_CLUSTER": [],
-    "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [],
-    "ENERGY_PREFERENCE_CLUSTER": [],
-    "FAN_CONTROL_CLUSTER": [],
-    "FAULT_INJECTION_CLUSTER": [],
-    "FIXED_LABEL_CLUSTER": [],
-    "FLOW_MEASUREMENT_CLUSTER": [],
-    "FORMALDEHYDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-    "GENERAL_COMMISSIONING_CLUSTER": [],
-    "GENERAL_DIAGNOSTICS_CLUSTER": [],
-    "GROUP_KEY_MANAGEMENT_CLUSTER": [],
-    "GROUPS_CLUSTER": [],
-    "HEPA_FILTER_MONITORING_CLUSTER": [],
-    "ICD_MANAGEMENT_CLUSTER": [],
-    "IDENTIFY_CLUSTER": [],
-    "ILLUMINANCE_MEASUREMENT_CLUSTER": [],
-    "KEYPAD_INPUT_CLUSTER": [],
-    "LAUNDRY_WASHER_MODE_CLUSTER": [],
-    "LEVEL_CONTROL_CLUSTER": [],
-    "LOCALIZATION_CONFIGURATION_CLUSTER": [],
-    "LOW_POWER_CLUSTER": [],
-    "MEDIA_INPUT_CLUSTER": [],
-    "MEDIA_PLAYBACK_CLUSTER": [],
-    "MICROWAVE_OVEN_CONTROL_CLUSTER": [],
-    "MESSAGES_CLUSTER": [],
-    "MODE_SELECT_CLUSTER": [],
-    "NETWORK_COMMISSIONING_CLUSTER": [],
-    "SAMPLE_MEI_CLUSTER": [],
-    "NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-    "OCCUPANCY_SENSING_CLUSTER": [],
-    "ON_OFF_CLUSTER": [],
-    "OPERATIONAL_CREDENTIALS_CLUSTER": [],
-    "OPERATIONAL_STATE_CLUSTER": [],
-    "OPERATIONAL_STATE_OVEN_CLUSTER": [],
-    "OPERATIONAL_STATE_RVC_CLUSTER": [],
-    "OTA_BOOTLOAD_CLUSTER": [],
-    "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": [],
-    "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": [],
-    "OVEN_MODE_CLUSTER": [],
-    "OZONE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-    "PM10_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-    "PM1_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-    "PM2_5_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-    "POLL_CONTROL_CLUSTER": [],
-    "POWER_CONFIG_CLUSTER": [],
-    "POWER_PROFILE_CLUSTER": [],
-    "POWER_SOURCE_CLUSTER": [],
-    "POWER_SOURCE_CONFIGURATION_CLUSTER": [],
-    "POWER_TOPOLOGY_CLUSTER": [],
-    "PRESSURE_MEASUREMENT_CLUSTER": [],
-    "PROXY_CONFIGURATION_CLUSTER": [],
-    "PROXY_DISCOVERY_CLUSTER": [],
-    "PROXY_VALID_CLUSTER": [],
-    "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER": [
-      "pump-configuration-and-control-client"
-    ],
-    "PWM_CLUSTER": [],
-    "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER": [],
-    "RADON_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-    "REFRIGERATOR_ALARM_CLUSTER": [],
-    "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER": [],
-    "RVC_CLEAN_MODE_CLUSTER": [],
-    "RVC_RUN_MODE_CLUSTER": [],
-    "SCENES_CLUSTER": [],
-    "SERVICE_AREA_CLUSTER": [],
-    "SMOKE_CO_ALARM_CLUSTER": [],
-    "SOFTWARE_DIAGNOSTICS_CLUSTER": [],
-    "SWITCH_CLUSTER": [],
-    "TARGET_NAVIGATOR_CLUSTER": [],
-    "TEMPERATURE_CONTROL_CLUSTER": [],
-    "TEMPERATURE_MEASUREMENT_CLUSTER": [],
-    "THERMOSTAT_CLUSTER": [
-      "thermostat-client"
-    ],
-    "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [],
-    "THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER": [],
-    "THREAD_NETWORK_DIAGNOSTICS_CLUSTER": [],
-    "THREAD_NETWORK_DIRECTORY_CLUSTER": [],
-    "TIME_CLUSTER": [],
-    "TIME_FORMAT_LOCALIZATION_CLUSTER": [],
-    "TIME_SYNCHRONIZATION_CLUSTER": [],
-    "TIMER_CLUSTER": [],
-    "TRUSTED_ROOT_CERTIFICATES_CLUSTER": [],
-    "UNIT_LOCALIZATION_CLUSTER": [],
-    "UNIT_TESTING_CLUSTER": [],
-    "USER_LABEL_CLUSTER": [],
-    "TVOC_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-    "VALVE_CONFIGURATION_AND_CONTROL_CLUSTER": [],
-    "WAKE_ON_LAN_CLUSTER": [],
-    "LAUNDRY_WASHER_CONTROLS_CLUSTER": [],
-    "LAUNDRY_DRYER_CONTROLS_CLUSTER": [],
-    "WATER_HEATER_MANAGEMENT_CLUSTER": [],
-    "WATER_HEATER_MODE_CLUSTER": [],
-    "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [],
-    "WINDOW_COVERING_CLUSTER": []
-  },
-  "ServerDirectories": {
-    "ACCESS_CONTROL_CLUSTER": [
-      "access-control-server"
-    ],
-    "ACCOUNT_LOGIN_CLUSTER": [
-      "account-login-server"
-    ],
-    "ACTIONS_CLUSTER": [],
-    "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER": [
-      "resource-monitoring-server"
-    ],
-    "ADMINISTRATOR_COMMISSIONING_CLUSTER": [
-      "administrator-commissioning-server"
-    ],
-    "AIR_QUALITY_CLUSTER": [
-      "air-quality-server"
-    ],
-    "ALARM_CLUSTER": [],
-    "APPLICATION_BASIC_CLUSTER": [
-      "application-basic-server"
-    ],
-    "APPLICATION_LAUNCHER_CLUSTER": [
-      "application-launcher-server"
-    ],
-    "AUDIO_OUTPUT_CLUSTER": [
-      "audio-output-server"
-    ],
-    "BALLAST_CONFIGURATION_CLUSTER": [],
-    "BASIC_INFORMATION_CLUSTER": [
-      "basic-information"
-    ],
-    "BINDING_CLUSTER": [
-      "bindings"
-    ],
-    "BOOLEAN_STATE_CLUSTER": [],
-    "BOOLEAN_STATE_CONFIGURATION_CLUSTER": [
-      "boolean-state-configuration-server"
-    ],
-    "BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [
-      "bridged-device-basic-information-server"
-    ],
-    "CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [
-      "concentration-measurement-server"
-    ],
-    "CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [
-      "concentration-measurement-server"
-    ],
-    "CHANNEL_CLUSTER": [
-      "channel-server"
-    ],
-    "COLOR_CONTROL_CLUSTER": [
-      "color-control-server"
-    ],
-    "COMMISSIONER_CONTROL_CLUSTER": [
-      "commissioner-control-server"
-    ],
-    "COMMISSIONING_CLUSTER": [],
-    "CONTENT_LAUNCHER_CLUSTER": [
-      "content-launch-server"
-    ],
-    "CONTENT_CONTROL_CLUSTER": [
-      "content-control-server"
-    ],
-    "CONTENT_APP_OBSERVER_CLUSTER": [
-      "content-app-observer"
-    ],
-    "DESCRIPTOR_CLUSTER": [
-      "descriptor"
-    ],
-    "DEVICE_ENERGY_MANAGEMENT_CLUSTER": [
-      "device-energy-management-server"
-    ],
-    "DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER": [
-      "mode-base-server"
-    ],
-    "DEVICE_TEMP_CLUSTER": [],
-    "DIAGNOSTIC_LOGS_CLUSTER": [
-      "diagnostic-logs-server"
-    ],
-    "DISHWASHER_ALARM_CLUSTER": [
-      "dishwasher-alarm-server"
-    ],
-    "DISHWASHER_MODE_CLUSTER": [
-      "mode-base-server"
-    ],
-    "MICROWAVE_OVEN_MODE_CLUSTER": [
-      "mode-base-server"
-    ],
-    "DOOR_LOCK_CLUSTER": [
-      "door-lock-server"
-    ],
-    "ECOSYSTEM_INFORMATION_CLUSTER": [
-      "ecosystem-information-server"
-    ],
-    "ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER": [
-      "electrical-energy-measurement-server"
-    ],
-    "ELECTRICAL_POWER_MEASUREMENT_CLUSTER": [
-      "electrical-power-measurement-server"
-    ],
-    "ENERGY_EVSE_CLUSTER": [
-      "energy-evse-server"
-    ],
-    "ENERGY_EVSE_MODE_CLUSTER": [
-      "mode-base-server"
-    ],
-    "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [
-      "ethernet-network-diagnostics-server"
-    ],
-    "ENERGY_PREFERENCE_CLUSTER": [
-      "energy-preference-server"
-    ],
-    "FAN_CONTROL_CLUSTER": [
-      "fan-control-server"
-    ],
-    "FAULT_INJECTION_CLUSTER": [
-      "fault-injection-server"
-    ],
-    "FIXED_LABEL_CLUSTER": [
-      "fixed-label-server"
-    ],
-    "FLOW_MEASUREMENT_CLUSTER": [],
-    "FORMALDEHYDE_CONCENTRATION_MEASUREMENT_CLUSTER": [
-      "concentration-measurement-server"
-    ],
-    "GENERAL_COMMISSIONING_CLUSTER": [
-      "general-commissioning-server"
-    ],
-    "GENERAL_DIAGNOSTICS_CLUSTER": [
-      "general-diagnostics-server"
-    ],
-    "GROUPS_CLUSTER": [
-      "groups-server"
-    ],
-    "HEPA_FILTER_MONITORING_CLUSTER": [
-      "resource-monitoring-server"
-    ],
-    "GROUP_KEY_MANAGEMENT_CLUSTER": [
-      "group-key-mgmt-server"
-    ],
-    "ICD_MANAGEMENT_CLUSTER": [
-      "icd-management-server"
-    ],
-    "IDENTIFY_CLUSTER": [
-      "identify-server"
-    ],
-    "ILLUMINANCE_MEASUREMENT_CLUSTER": [],
-    "KEYPAD_INPUT_CLUSTER": [
-      "keypad-input-server"
-    ],
-    "LAUNDRY_WASHER_MODE_CLUSTER": [
-      "mode-base-server"
-    ],
-    "LEVEL_CONTROL_CLUSTER": [
-      "level-control"
-    ],
-    "LOCALIZATION_CONFIGURATION_CLUSTER": [
-      "localization-configuration-server"
-    ],
-    "LOW_POWER_CLUSTER": [
-      "low-power-server"
-    ],
-    "MEDIA_INPUT_CLUSTER": [
-      "media-input-server"
-    ],
-    "MEDIA_PLAYBACK_CLUSTER": [
-      "media-playback-server"
-    ],
-    "MICROWAVE_OVEN_CONTROL_CLUSTER": [
-      "microwave-oven-control-server"
-    ],
-    "MESSAGES_CLUSTER": [
-      "messages-server"
-    ],
-    "MODE_SELECT_CLUSTER": [
-      "mode-select-server"
-    ],
-    "NETWORK_COMMISSIONING_CLUSTER": [
-      "network-commissioning"
-    ],
-    "NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [
-      "concentration-measurement-server"
-    ],
-    "SAMPLE_MEI_CLUSTER": [
-      "sample-mei-server"
-    ],
-    "OCCUPANCY_SENSING_CLUSTER": [
-      "occupancy-sensor-server"
-    ],
-    "ON_OFF_CLUSTER": [
-      "on-off-server"
-    ],
-    "POWER_TOPOLOGY_CLUSTER": [
-      "power-topology-server"
-    ],
-    "OPERATIONAL_CREDENTIALS_CLUSTER": [
-      "operational-credentials-server"
-    ],
-    "OPERATIONAL_STATE_CLUSTER": [
-      "operational-state-server"
-    ],
-    "OPERATIONAL_STATE_OVEN_CLUSTER": [
-      "operational-state-server"
-    ],
-    "OPERATIONAL_STATE_RVC_CLUSTER": [
-      "operational-state-server"
-    ],
-    "OTA_BOOTLOAD_CLUSTER": [],
-    "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": [
-      "ota-provider"
-    ],
-    "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": [
-      "ota-requestor"
-    ],
-    "OVEN_MODE_CLUSTER": [
-      "mode-base-server"
-    ],
-    "OZONE_CONCENTRATION_MEASUREMENT_CLUSTER": [
-      "concentration-measurement-server"
-    ],
-    "PM10_CONCENTRATION_MEASUREMENT_CLUSTER": [
-      "concentration-measurement-server"
-    ],
-    "PM1_CONCENTRATION_MEASUREMENT_CLUSTER": [
-      "concentration-measurement-server"
-    ],
-    "PM2_5_CONCENTRATION_MEASUREMENT_CLUSTER": [
-      "concentration-measurement-server"
-    ],
-    "POLL_CONTROL_CLUSTER": [],
-    "POWER_CONFIG_CLUSTER": [],
-    "POWER_PROFILE_CLUSTER": [],
-    "POWER_SOURCE_CLUSTER": [
-      "power-source-server"
-    ],
-    "POWER_SOURCE_CONFIGURATION_CLUSTER": [
-      "power-source-configuration-server"
-    ],
-    "PRESSURE_MEASUREMENT_CLUSTER": [],
-    "PROXY_CONFIGURATION_CLUSTER": [],
-    "PROXY_DISCOVERY_CLUSTER": [],
-    "PROXY_VALID_CLUSTER": [],
-    "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER": [
-      "pump-configuration-and-control-server"
-    ],
-    "PWM_CLUSTER": [],
-    "RADON_CONCENTRATION_MEASUREMENT_CLUSTER": [
-      "concentration-measurement-server"
-    ],
-    "REFRIGERATOR_ALARM_CLUSTER": [
-      "refrigerator-alarm-server"
-    ],
-    "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER": [
-      "mode-base-server"
-    ],
-    "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER": [],
-    "RVC_CLEAN_MODE_CLUSTER": [
-      "mode-base-server"
-    ],
-    "RVC_RUN_MODE_CLUSTER": [
-      "mode-base-server"
-    ],
-    "SCENES_CLUSTER": [
-      "scenes-server"
-    ],
-    "SERVICE_AREA_CLUSTER": [
-      "service-area-server"
-    ],
-    "SMOKE_CO_ALARM_CLUSTER": [
-      "smoke-co-alarm-server"
-    ],
-    "SOFTWARE_DIAGNOSTICS_CLUSTER": [
-      "software-diagnostics-server"
-    ],
-    "SWITCH_CLUSTER": [
-      "switch-server"
-    ],
-    "TARGET_NAVIGATOR_CLUSTER": [
-      "target-navigator-server"
-    ],
-    "TEMPERATURE_CONTROL_CLUSTER": [
-      "temperature-control-server"
-    ],
-    "TEMPERATURE_MEASUREMENT_CLUSTER": [],
-    "THERMOSTAT_CLUSTER": [
-      "thermostat-server"
-    ],
-    "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [
-      "thermostat-user-interface-configuration-server"
-    ],
-    "THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER": [
-      "thread-border-router-management-server"
-    ],
-    "THREAD_NETWORK_DIAGNOSTICS_CLUSTER": [
-      "thread-network-diagnostics-server"
-    ],
-    "THREAD_NETWORK_DIRECTORY_CLUSTER": [
-      "thread-network-directory-server"
-    ],
-    "TIME_CLUSTER": [],
-    "TIME_FORMAT_LOCALIZATION_CLUSTER": [
-      "time-format-localization-server"
-    ],
-    "TIME_SYNCHRONIZATION_CLUSTER": [
-      "time-synchronization-server"
-    ],
-    "TIMER_CLUSTER": [
-      "timer-server"
-    ],
-    "TVOC_CONCENTRATION_MEASUREMENT_CLUSTER": [
-      "concentration-measurement-server"
-    ],
-    "UNIT_LOCALIZATION_CLUSTER": [],
-    "UNIT_TESTING_CLUSTER": [
-      "test-cluster-server"
-    ],
-    "USER_LABEL_CLUSTER": [
-      "user-label-server"
-    ],
-    "VALVE_CONFIGURATION_AND_CONTROL_CLUSTER": [
-      "valve-configuration-and-control-server"
-    ],
-    "WAKE_ON_LAN_CLUSTER": [
-      "wake-on-lan-server"
-    ],
-    "LAUNDRY_WASHER_CONTROLS_CLUSTER": [
-      "laundry-washer-controls-server"
-    ],
-    "LAUNDRY_DRYER_CONTROLS_CLUSTER": [
-      "laundry-dryer-controls-server"
-    ],
-    "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [
-      "wifi-network-diagnostics-server"
-    ],
-    "WIFI_NETWORK_MANAGEMENT_CLUSTER": [
-      "wifi-network-management-server"
-    ],
-    "WINDOW_COVERING_CLUSTER": [
-      "window-covering-server"
-    ],
-    "WATER_HEATER_MANAGEMENT_CLUSTER": [
-      "water-heater-management-server"
-    ],
-    "WATER_HEATER_MODE_CLUSTER": [
-      "mode-base-server"
-    ]
-  }
+    "ClientDirectories": {
+        "ACCESS_CONTROL_CLUSTER": [],
+        "ACCOUNT_LOGIN_CLUSTER": [],
+        "ACTIONS_CLUSTER": [],
+        "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER": [],
+        "ADMINISTRATOR_COMMISSIONING_CLUSTER": [],
+        "AIR_QUALITY_CLUSTER": [],
+        "ALARM_CLUSTER": [],
+        "APPLICATION_BASIC_CLUSTER": [],
+        "APPLICATION_LAUNCHER_CLUSTER": [],
+        "AUDIO_OUTPUT_CLUSTER": [],
+        "BALLAST_CONFIGURATION_CLUSTER": [],
+        "BASIC_INFORMATION_CLUSTER": [],
+        "BINDING_CLUSTER": [],
+        "BOOLEAN_STATE_CLUSTER": [],
+        "BOOLEAN_STATE_CONFIGURATION_CLUSTER": [],
+        "BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [],
+        "CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
+        "CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
+        "CHANNEL_CLUSTER": [],
+        "CLIENT_MONITORING_CLUSTER": [],
+        "COLOR_CONTROL_CLUSTER": [],
+        "COMMISSIONER_CONTROL_CLUSTER": [],
+        "COMMISSIONING_CLUSTER": [],
+        "CONTENT_LAUNCHER_CLUSTER": [],
+        "CONTENT_CONTROL_CLUSTER": [],
+        "CONTENT_APP_OBSERVER_CLUSTER": [],
+        "DESCRIPTOR_CLUSTER": [],
+        "DEVICE_ENERGY_MANAGEMENT_CLUSTER": [],
+        "DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER": [],
+        "DEVICE_TEMP_CLUSTER": [],
+        "DIAGNOSTIC_LOGS_CLUSTER": [],
+        "DISHWASHER_ALARM_CLUSTER": [],
+        "DISHWASHER_MODE_CLUSTER": [],
+        "MICROWAVE_OVEN_MODE_CLUSTER": [],
+        "DOOR_LOCK_CLUSTER": [],
+        "ECOSYSTEM_INFORMATION_CLUSTER": [],
+        "ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER": [],
+        "ELECTRICAL_POWER_MEASUREMENT_CLUSTER": [],
+        "ENERGY_EVSE_CLUSTER": [],
+        "ENERGY_EVSE_MODE_CLUSTER": [],
+        "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [],
+        "ENERGY_PREFERENCE_CLUSTER": [],
+        "FAN_CONTROL_CLUSTER": [],
+        "FAULT_INJECTION_CLUSTER": [],
+        "FIXED_LABEL_CLUSTER": [],
+        "FLOW_MEASUREMENT_CLUSTER": [],
+        "FORMALDEHYDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
+        "GENERAL_COMMISSIONING_CLUSTER": [],
+        "GENERAL_DIAGNOSTICS_CLUSTER": [],
+        "GROUP_KEY_MANAGEMENT_CLUSTER": [],
+        "GROUPS_CLUSTER": [],
+        "HEPA_FILTER_MONITORING_CLUSTER": [],
+        "ICD_MANAGEMENT_CLUSTER": [],
+        "IDENTIFY_CLUSTER": [],
+        "ILLUMINANCE_MEASUREMENT_CLUSTER": [],
+        "KEYPAD_INPUT_CLUSTER": [],
+        "LAUNDRY_WASHER_MODE_CLUSTER": [],
+        "LEVEL_CONTROL_CLUSTER": [],
+        "LOCALIZATION_CONFIGURATION_CLUSTER": [],
+        "LOW_POWER_CLUSTER": [],
+        "MEDIA_INPUT_CLUSTER": [],
+        "MEDIA_PLAYBACK_CLUSTER": [],
+        "MICROWAVE_OVEN_CONTROL_CLUSTER": [],
+        "MESSAGES_CLUSTER": [],
+        "MODE_SELECT_CLUSTER": [],
+        "NETWORK_COMMISSIONING_CLUSTER": [],
+        "SAMPLE_MEI_CLUSTER": [],
+        "NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
+        "OCCUPANCY_SENSING_CLUSTER": [],
+        "ON_OFF_CLUSTER": [],
+        "OPERATIONAL_CREDENTIALS_CLUSTER": [],
+        "OPERATIONAL_STATE_CLUSTER": [],
+        "OPERATIONAL_STATE_OVEN_CLUSTER": [],
+        "OPERATIONAL_STATE_RVC_CLUSTER": [],
+        "OTA_BOOTLOAD_CLUSTER": [],
+        "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": [],
+        "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": [],
+        "OVEN_MODE_CLUSTER": [],
+        "OZONE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
+        "PM10_CONCENTRATION_MEASUREMENT_CLUSTER": [],
+        "PM1_CONCENTRATION_MEASUREMENT_CLUSTER": [],
+        "PM2_5_CONCENTRATION_MEASUREMENT_CLUSTER": [],
+        "POLL_CONTROL_CLUSTER": [],
+        "POWER_CONFIG_CLUSTER": [],
+        "POWER_PROFILE_CLUSTER": [],
+        "POWER_SOURCE_CLUSTER": [],
+        "POWER_SOURCE_CONFIGURATION_CLUSTER": [],
+        "POWER_TOPOLOGY_CLUSTER": [],
+        "PRESSURE_MEASUREMENT_CLUSTER": [],
+        "PROXY_CONFIGURATION_CLUSTER": [],
+        "PROXY_DISCOVERY_CLUSTER": [],
+        "PROXY_VALID_CLUSTER": [],
+        "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER": [
+            "pump-configuration-and-control-client"
+        ],
+        "PWM_CLUSTER": [],
+        "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER": [],
+        "RADON_CONCENTRATION_MEASUREMENT_CLUSTER": [],
+        "REFRIGERATOR_ALARM_CLUSTER": [],
+        "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER": [],
+        "RVC_CLEAN_MODE_CLUSTER": [],
+        "RVC_RUN_MODE_CLUSTER": [],
+        "SCENES_CLUSTER": [],
+        "SERVICE_AREA_CLUSTER": [],
+        "SMOKE_CO_ALARM_CLUSTER": [],
+        "SOFTWARE_DIAGNOSTICS_CLUSTER": [],
+        "SWITCH_CLUSTER": [],
+        "TARGET_NAVIGATOR_CLUSTER": [],
+        "TEMPERATURE_CONTROL_CLUSTER": [],
+        "TEMPERATURE_MEASUREMENT_CLUSTER": [],
+        "THERMOSTAT_CLUSTER": ["thermostat-client"],
+        "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [],
+        "THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER": [],
+        "THREAD_NETWORK_DIAGNOSTICS_CLUSTER": [],
+        "THREAD_NETWORK_DIRECTORY_CLUSTER": [],
+        "TIME_CLUSTER": [],
+        "TIME_FORMAT_LOCALIZATION_CLUSTER": [],
+        "TIME_SYNCHRONIZATION_CLUSTER": [],
+        "TIMER_CLUSTER": [],
+        "TRUSTED_ROOT_CERTIFICATES_CLUSTER": [],
+        "UNIT_LOCALIZATION_CLUSTER": [],
+        "UNIT_TESTING_CLUSTER": [],
+        "USER_LABEL_CLUSTER": [],
+        "TVOC_CONCENTRATION_MEASUREMENT_CLUSTER": [],
+        "VALVE_CONFIGURATION_AND_CONTROL_CLUSTER": [],
+        "WAKE_ON_LAN_CLUSTER": [],
+        "LAUNDRY_WASHER_CONTROLS_CLUSTER": [],
+        "LAUNDRY_DRYER_CONTROLS_CLUSTER": [],
+        "WATER_HEATER_MANAGEMENT_CLUSTER": [],
+        "WATER_HEATER_MODE_CLUSTER": [],
+        "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [],
+        "WINDOW_COVERING_CLUSTER": []
+    },
+    "ServerDirectories": {
+        "ACCESS_CONTROL_CLUSTER": ["access-control-server"],
+        "ACCOUNT_LOGIN_CLUSTER": ["account-login-server"],
+        "ACTIONS_CLUSTER": [],
+        "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER": [
+            "resource-monitoring-server"
+        ],
+        "ADMINISTRATOR_COMMISSIONING_CLUSTER": [
+            "administrator-commissioning-server"
+        ],
+        "AIR_QUALITY_CLUSTER": ["air-quality-server"],
+        "ALARM_CLUSTER": [],
+        "APPLICATION_BASIC_CLUSTER": ["application-basic-server"],
+        "APPLICATION_LAUNCHER_CLUSTER": ["application-launcher-server"],
+        "AUDIO_OUTPUT_CLUSTER": ["audio-output-server"],
+        "BALLAST_CONFIGURATION_CLUSTER": [],
+        "BASIC_INFORMATION_CLUSTER": ["basic-information"],
+        "BINDING_CLUSTER": ["bindings"],
+        "BOOLEAN_STATE_CLUSTER": [],
+        "BOOLEAN_STATE_CONFIGURATION_CLUSTER": [
+            "boolean-state-configuration-server"
+        ],
+        "BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [
+            "bridged-device-basic-information-server"
+        ],
+        "CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [
+            "concentration-measurement-server"
+        ],
+        "CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [
+            "concentration-measurement-server"
+        ],
+        "CHANNEL_CLUSTER": ["channel-server"],
+        "COLOR_CONTROL_CLUSTER": ["color-control-server"],
+        "COMMISSIONER_CONTROL_CLUSTER": ["commissioner-control-server"],
+        "COMMISSIONING_CLUSTER": [],
+        "CONTENT_LAUNCHER_CLUSTER": ["content-launch-server"],
+        "CONTENT_CONTROL_CLUSTER": ["content-control-server"],
+        "CONTENT_APP_OBSERVER_CLUSTER": ["content-app-observer"],
+        "DESCRIPTOR_CLUSTER": ["descriptor"],
+        "DEVICE_ENERGY_MANAGEMENT_CLUSTER": ["device-energy-management-server"],
+        "DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER": ["mode-base-server"],
+        "DEVICE_TEMP_CLUSTER": [],
+        "DIAGNOSTIC_LOGS_CLUSTER": ["diagnostic-logs-server"],
+        "DISHWASHER_ALARM_CLUSTER": ["dishwasher-alarm-server"],
+        "DISHWASHER_MODE_CLUSTER": ["mode-base-server"],
+        "MICROWAVE_OVEN_MODE_CLUSTER": ["mode-base-server"],
+        "DOOR_LOCK_CLUSTER": ["door-lock-server"],
+        "ECOSYSTEM_INFORMATION_CLUSTER": ["ecosystem-information-server"],
+        "ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER": [
+            "electrical-energy-measurement-server"
+        ],
+        "ELECTRICAL_POWER_MEASUREMENT_CLUSTER": [
+            "electrical-power-measurement-server"
+        ],
+        "ENERGY_EVSE_CLUSTER": ["energy-evse-server"],
+        "ENERGY_EVSE_MODE_CLUSTER": ["mode-base-server"],
+        "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [
+            "ethernet-network-diagnostics-server"
+        ],
+        "ENERGY_PREFERENCE_CLUSTER": ["energy-preference-server"],
+        "FAN_CONTROL_CLUSTER": ["fan-control-server"],
+        "FAULT_INJECTION_CLUSTER": ["fault-injection-server"],
+        "FIXED_LABEL_CLUSTER": ["fixed-label-server"],
+        "FLOW_MEASUREMENT_CLUSTER": [],
+        "FORMALDEHYDE_CONCENTRATION_MEASUREMENT_CLUSTER": [
+            "concentration-measurement-server"
+        ],
+        "GENERAL_COMMISSIONING_CLUSTER": ["general-commissioning-server"],
+        "GENERAL_DIAGNOSTICS_CLUSTER": ["general-diagnostics-server"],
+        "GROUPS_CLUSTER": ["groups-server"],
+        "HEPA_FILTER_MONITORING_CLUSTER": ["resource-monitoring-server"],
+        "GROUP_KEY_MANAGEMENT_CLUSTER": ["group-key-mgmt-server"],
+        "ICD_MANAGEMENT_CLUSTER": ["icd-management-server"],
+        "IDENTIFY_CLUSTER": ["identify-server"],
+        "ILLUMINANCE_MEASUREMENT_CLUSTER": [],
+        "KEYPAD_INPUT_CLUSTER": ["keypad-input-server"],
+        "LAUNDRY_WASHER_MODE_CLUSTER": ["mode-base-server"],
+        "LEVEL_CONTROL_CLUSTER": ["level-control"],
+        "LOCALIZATION_CONFIGURATION_CLUSTER": [
+            "localization-configuration-server"
+        ],
+        "LOW_POWER_CLUSTER": ["low-power-server"],
+        "MEDIA_INPUT_CLUSTER": ["media-input-server"],
+        "MEDIA_PLAYBACK_CLUSTER": ["media-playback-server"],
+        "MICROWAVE_OVEN_CONTROL_CLUSTER": ["microwave-oven-control-server"],
+        "MESSAGES_CLUSTER": ["messages-server"],
+        "MODE_SELECT_CLUSTER": ["mode-select-server"],
+        "NETWORK_COMMISSIONING_CLUSTER": ["network-commissioning"],
+        "NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [
+            "concentration-measurement-server"
+        ],
+        "SAMPLE_MEI_CLUSTER": ["sample-mei-server"],
+        "OCCUPANCY_SENSING_CLUSTER": ["occupancy-sensor-server"],
+        "ON_OFF_CLUSTER": ["on-off-server"],
+        "POWER_TOPOLOGY_CLUSTER": ["power-topology-server"],
+        "OPERATIONAL_CREDENTIALS_CLUSTER": ["operational-credentials-server"],
+        "OPERATIONAL_STATE_CLUSTER": ["operational-state-server"],
+        "OPERATIONAL_STATE_OVEN_CLUSTER": ["operational-state-server"],
+        "OPERATIONAL_STATE_RVC_CLUSTER": ["operational-state-server"],
+        "OTA_BOOTLOAD_CLUSTER": [],
+        "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": ["ota-provider"],
+        "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": ["ota-requestor"],
+        "OVEN_MODE_CLUSTER": ["mode-base-server"],
+        "OZONE_CONCENTRATION_MEASUREMENT_CLUSTER": [
+            "concentration-measurement-server"
+        ],
+        "PM10_CONCENTRATION_MEASUREMENT_CLUSTER": [
+            "concentration-measurement-server"
+        ],
+        "PM1_CONCENTRATION_MEASUREMENT_CLUSTER": [
+            "concentration-measurement-server"
+        ],
+        "PM2_5_CONCENTRATION_MEASUREMENT_CLUSTER": [
+            "concentration-measurement-server"
+        ],
+        "POLL_CONTROL_CLUSTER": [],
+        "POWER_CONFIG_CLUSTER": [],
+        "POWER_PROFILE_CLUSTER": [],
+        "POWER_SOURCE_CLUSTER": ["power-source-server"],
+        "POWER_SOURCE_CONFIGURATION_CLUSTER": [
+            "power-source-configuration-server"
+        ],
+        "PRESSURE_MEASUREMENT_CLUSTER": [],
+        "PROXY_CONFIGURATION_CLUSTER": [],
+        "PROXY_DISCOVERY_CLUSTER": [],
+        "PROXY_VALID_CLUSTER": [],
+        "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER": [
+            "pump-configuration-and-control-server"
+        ],
+        "PWM_CLUSTER": [],
+        "RADON_CONCENTRATION_MEASUREMENT_CLUSTER": [
+            "concentration-measurement-server"
+        ],
+        "REFRIGERATOR_ALARM_CLUSTER": ["refrigerator-alarm-server"],
+        "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER": [
+            "mode-base-server"
+        ],
+        "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER": [],
+        "RVC_CLEAN_MODE_CLUSTER": ["mode-base-server"],
+        "RVC_RUN_MODE_CLUSTER": ["mode-base-server"],
+        "SCENES_CLUSTER": ["scenes-server"],
+        "SERVICE_AREA_CLUSTER": ["service-area-server"],
+        "SMOKE_CO_ALARM_CLUSTER": ["smoke-co-alarm-server"],
+        "SOFTWARE_DIAGNOSTICS_CLUSTER": ["software-diagnostics-server"],
+        "SWITCH_CLUSTER": ["switch-server"],
+        "TARGET_NAVIGATOR_CLUSTER": ["target-navigator-server"],
+        "TEMPERATURE_CONTROL_CLUSTER": ["temperature-control-server"],
+        "TEMPERATURE_MEASUREMENT_CLUSTER": [],
+        "THERMOSTAT_CLUSTER": ["thermostat-server"],
+        "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [
+            "thermostat-user-interface-configuration-server"
+        ],
+        "THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER": [
+            "thread-border-router-management-server"
+        ],
+        "THREAD_NETWORK_DIAGNOSTICS_CLUSTER": [
+            "thread-network-diagnostics-server"
+        ],
+        "THREAD_NETWORK_DIRECTORY_CLUSTER": ["thread-network-directory-server"],
+        "TIME_CLUSTER": [],
+        "TIME_FORMAT_LOCALIZATION_CLUSTER": ["time-format-localization-server"],
+        "TIME_SYNCHRONIZATION_CLUSTER": ["time-synchronization-server"],
+        "TIMER_CLUSTER": ["timer-server"],
+        "TVOC_CONCENTRATION_MEASUREMENT_CLUSTER": [
+            "concentration-measurement-server"
+        ],
+        "UNIT_LOCALIZATION_CLUSTER": [],
+        "UNIT_TESTING_CLUSTER": ["test-cluster-server"],
+        "USER_LABEL_CLUSTER": ["user-label-server"],
+        "VALVE_CONFIGURATION_AND_CONTROL_CLUSTER": [
+            "valve-configuration-and-control-server"
+        ],
+        "WAKE_ON_LAN_CLUSTER": ["wake-on-lan-server"],
+        "LAUNDRY_WASHER_CONTROLS_CLUSTER": ["laundry-washer-controls-server"],
+        "LAUNDRY_DRYER_CONTROLS_CLUSTER": ["laundry-dryer-controls-server"],
+        "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": ["wifi-network-diagnostics-server"],
+        "WIFI_NETWORK_MANAGEMENT_CLUSTER": ["wifi-network-management-server"],
+        "WINDOW_COVERING_CLUSTER": ["window-covering-server"],
+        "WATER_HEATER_MANAGEMENT_CLUSTER": ["water-heater-management-server"],
+        "WATER_HEATER_MODE_CLUSTER": ["mode-base-server"]
+    }
 }